Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7109)

Unified Diff: chrome/browser/sync/glue/sync_backend_host_core.cc

Issue 442403003: Update SyncManager::Init to use a GURL for the sync server URL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix sync_client.cc too. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sync/internal_api/public/sync_manager.h » ('j') | sync/internal_api/sync_manager_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/sync_backend_host_core.cc
diff --git a/chrome/browser/sync/glue/sync_backend_host_core.cc b/chrome/browser/sync/glue/sync_backend_host_core.cc
index 98e1a4e93f73aa7af5ff245b105db47d28f4f3ee..08916bc3e73c08961ca110f43cb5d250a768d4c6 100644
--- a/chrome/browser/sync/glue/sync_backend_host_core.cc
+++ b/chrome/browser/sync/glue/sync_backend_host_core.cc
@@ -23,6 +23,7 @@
#include "sync/internal_api/public/sync_context_proxy.h"
#include "sync/internal_api/public/sync_manager.h"
#include "sync/internal_api/public/sync_manager_factory.h"
+#include "url/gurl.h"
// Helper macros to log with the syncer thread name; useful when there
// are multiple syncers involved.
@@ -431,9 +432,7 @@ void SyncBackendHostCore::DoInitialize(
sync_manager_->AddObserver(this);
sync_manager_->Init(sync_data_folder_path_,
options->event_handler,
- options->service_url.host() + options->service_url.path(),
- options->service_url.EffectiveIntPort(),
- options->service_url.SchemeIsSecure(),
+ options->service_url,
options->http_bridge_factory.Pass(),
options->workers,
options->extensions_activity,
@@ -752,4 +751,3 @@ void SyncBackendHostCore::SaveChanges() {
}
} // namespace browser_sync
-
« no previous file with comments | « no previous file | sync/internal_api/public/sync_manager.h » ('j') | sync/internal_api/sync_manager_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698