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

sync/internal_api/sync_manager_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/internal_api/sync_manager_impl.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 32 matching lines @@
 #include "sync/protocol/sync.pb.h"
 #include "sync/sessions/directory_type_debug_info_emitter.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/entry.h"
 #include "sync/syncable/in_memory_directory_backing_store.h"
 #include "sync/syncable/on_disk_directory_backing_store.h"
 
 using base::TimeDelta;
 using sync_pb::GetUpdatesCallerInfo;
 
+class GURL;
+
 namespace syncer {
 
 using sessions::SyncSessionContext;
 using syncable::ImmutableWriteTransactionInfo;
 using syncable::SPECIFICS;
 using syncable::UNIQUE_POSITION;
 
 namespace {
 
 // Delays for syncer nudges.
@@ skipping 234 matching lines @@
                              ready_task,
                              retry_task);
 
   scheduler_->Start(SyncScheduler::CONFIGURATION_MODE);
   scheduler_->ScheduleConfiguration(params);
 }
 
 void SyncManagerImpl::Init(
     const base::FilePath& database_location,
     const WeakHandle<JsEventHandler>& event_handler,
-    const std::string& sync_server_and_path,
-    int port,
-    bool use_ssl,
+    const GURL& service_url,
     scoped_ptr<HttpPostProviderFactory> post_factory,
     const std::vector<scoped_refptr<ModelSafeWorker> >& workers,
     ExtensionsActivity* extensions_activity,
     SyncManager::ChangeDelegate* change_delegate,
     const SyncCredentials& credentials,
     const std::string& invalidator_client_id,
     const std::string& restored_key_for_bootstrapping,
     const std::string& restored_keystore_key_for_bootstrapping,
     InternalComponentsFactory* internal_components_factory,
     Encryptor* encryptor,
@@ skipping 57 matching lines @@
 
   const std::string& username = credentials.email;
   DVLOG(1) << "Username: " << username;
   if (!OpenDirectory(username)) {
     NotifyInitializationFailure();
     LOG(ERROR) << "Sync manager initialization failed!";
     return;
   }
 
   connection_manager_.reset(new SyncAPIServerConnectionManager(
-      sync_server_and_path, port, use_ssl,
-      post_factory.release(), cancelation_signal));
+      service_url.host() + service_url.path(),

[haitaol1, 2014/08/06 21:30:26]

Why don't continue to pass down GURL?

[maniscalco, 2014/08/06 21:33:40]

No reason other than I don't need it any deeper at this point.  In the future,
if I do (or I have extra time to do more cleanup), I'll continue plumbing it
through.

+      service_url.EffectiveIntPort(),
+      service_url.SchemeIsSecure(),
+      post_factory.release(),
+      cancelation_signal));
   connection_manager_->set_client_id(directory()->cache_guid());
   connection_manager_->AddListener(this);
 
   std::string sync_id = directory()->cache_guid();
 
   DVLOG(1) << "Setting sync client ID: " << sync_id;
   allstatus_.SetSyncId(sync_id);
   DVLOG(1) << "Setting invalidator client ID: " << invalidator_client_id;
   allstatus_.SetInvalidatorClientId(invalidator_client_id);
 
@@ skipping 748 matching lines @@
 int SyncManagerImpl::GetDefaultNudgeDelay() {
   return kDefaultNudgeDelayMilliseconds;
 }
 
 // static.
 int SyncManagerImpl::GetPreferencesNudgeDelay() {
   return kPreferencesNudgeDelayMilliseconds;
 }
 
 }  // namespace syncer