Update SyncManager::Init to use a GURL for the sync server URL.

sync/tools/sync_client.cc

Index: sync/tools/sync_client.cc
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc
index 34ba3388721ecc47a604c48927d128a02e6cbb87..5ae60d1359b080f8b09496a5986f90f0dc2404cb 100644
--- a/sync/tools/sync_client.cc
+++ b/sync/tools/sync_client.cc
@@ -46,6 +46,7 @@
 #include "sync/test/fake_encryptor.h"
 #include "sync/tools/invalidation_helper.h"
 #include "sync/tools/null_invalidation_state_tracker.h"
+#include "url/gurl.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
@@ -65,6 +66,7 @@ const char kXmppHostPortSwitch[] = "xmpp-host-port";
 const char kXmppTrySslTcpFirstSwitch[] = "xmpp-try-ssltcp-first";
 const char kXmppAllowInsecureConnectionSwitch[] =
     "xmpp-allow-insecure-connection";
+const char kSyncServiceURL[] = "https://clients4.google.com/chrome-sync/dev";
 
 // Needed to use a real host resolver.
 class MyTestURLRequestContext : public net::TestURLRequestContext {
@@ -404,9 +406,6 @@ int SyncClientMain(int argc, char* argv[]) {
   scoped_ptr<SyncManager> sync_manager =
       sync_manager_factory.CreateSyncManager("sync_client manager");
   LoggingJsEventHandler js_event_handler;
-  const char kSyncServerAndPath[] = "clients4.google.com/chrome-sync/dev";
-  int kSyncServerPort = 443;
-  bool kUseSsl = true;
   // Used only by InitialProcessMetadata(), so it's okay to leave this as NULL.
   const scoped_refptr<base::TaskRunner> blocking_task_runner = NULL;
   const char kUserAgent[] = "sync_client";
@@ -432,25 +431,22 @@ int SyncClientMain(int argc, char* argv[]) {
   CancelationSignal scm_cancelation_signal;
 
   sync_manager->Init(database_dir.path(),
-                    WeakHandle<JsEventHandler>(
-                        js_event_handler.AsWeakPtr()),
-                    kSyncServerAndPath,
-                    kSyncServerPort,
-                    kUseSsl,
-                    post_factory.Pass(),
-                    workers,
-                    extensions_activity,
-                    &change_delegate,
-                    credentials,
-                    invalidator_id,
-                    kRestoredKeyForBootstrapping,
-                    kRestoredKeystoreKeyForBootstrapping,
-                    new InternalComponentsFactoryImpl(factory_switches),
-                    &null_encryptor,
-                    scoped_ptr<UnrecoverableErrorHandler>(
-                        new LoggingUnrecoverableErrorHandler).Pass(),
-                    &LogUnrecoverableErrorContext,
-                    &scm_cancelation_signal);
+                     WeakHandle<JsEventHandler>(js_event_handler.AsWeakPtr()),
+                     GURL(kSyncServiceURL),
+                     post_factory.Pass(),
+                     workers,
+                     extensions_activity,
+                     &change_delegate,
+                     credentials,
+                     invalidator_id,
+                     kRestoredKeyForBootstrapping,
+                     kRestoredKeystoreKeyForBootstrapping,
+                     new InternalComponentsFactoryImpl(factory_switches),
+                     &null_encryptor,
+                     scoped_ptr<UnrecoverableErrorHandler>(
+                         new LoggingUnrecoverableErrorHandler).Pass(),
+                     &LogUnrecoverableErrorContext,
+                     &scm_cancelation_signal);
   // TODO(akalin): Avoid passing in model parameters multiple times by
   // organizing handling of model types.
   invalidator->UpdateCredentials(credentials.email, credentials.sync_token);