diff --git a/components/sync/driver/glue/sync_engine_backend.cc b/components/sync/driver/glue/sync_engine_backend.cc index 6921ec9e5f4b7e..f786bc8ddc6680 100644 --- a/components/sync/driver/glue/sync_engine_backend.cc +++ b/components/sync/driver/glue/sync_engine_backend.cc @@ -16,7 +16,6 @@ #include "components/data_use_measurement/core/data_use_user_data.h" #include "components/invalidation/public/invalidation_util.h" #include "components/invalidation/public/object_id_invalidation_map.h" -#include "components/sync/base/get_session_name.h" #include "components/sync/base/invalidation_adapter.h" #include "components/sync/base/sync_base_switches.h" #include "components/sync/device_info/local_device_info_provider_impl.h" @@ -443,8 +442,7 @@ void SyncEngineBackend::DoInitialProcessControlTypes() { FROM_HERE, &SyncEngineImpl::HandleInitializationSuccessOnFrontendLoop, registrar_->GetLastConfiguredTypes(), js_backend_, debug_info_listener_, base::Passed(sync_manager_->GetModelTypeConnectorProxy()), - sync_manager_->cache_guid(), GetSessionNameBlocking(), - user_share->directory->store_birthday(), + sync_manager_->cache_guid(), user_share->directory->store_birthday(), user_share->directory->bag_of_chips()); js_backend_.Reset(); diff --git a/components/sync/driver/glue/sync_engine_impl.cc b/components/sync/driver/glue/sync_engine_impl.cc index 033d08b2d0fd7c..5140252fbd55ff 100644 --- a/components/sync/driver/glue/sync_engine_impl.cc +++ b/components/sync/driver/glue/sync_engine_impl.cc @@ -313,7 +313,6 @@ void SyncEngineImpl::HandleInitializationSuccessOnFrontendLoop( const WeakHandle debug_info_listener, std::unique_ptr model_type_connector, const std::string& cache_guid, - const std::string& session_name, const std::string& birthday, const std::string& bag_of_chips) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -332,7 +331,7 @@ void SyncEngineImpl::HandleInitializationSuccessOnFrontendLoop( } host_->OnEngineInitialized(initial_types, js_backend, debug_info_listener, - cache_guid, session_name, birthday, bag_of_chips, + cache_guid, birthday, bag_of_chips, /*success=*/true); } @@ -340,7 +339,7 @@ void SyncEngineImpl::HandleInitializationFailureOnFrontendLoop() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); host_->OnEngineInitialized(ModelTypeSet(), WeakHandle(), WeakHandle(), - /*cache_guid=*/"", /*session_name=*/"", + /*cache_guid=*/"", /*birthday=*/"", /*bag_of_chips=*/"", /*success=*/false); } diff --git a/components/sync/driver/glue/sync_engine_impl.h b/components/sync/driver/glue/sync_engine_impl.h index ce4ba137325e8e..9fce092e22ca63 100644 --- a/components/sync/driver/glue/sync_engine_impl.h +++ b/components/sync/driver/glue/sync_engine_impl.h @@ -124,7 +124,6 @@ class SyncEngineImpl : public SyncEngine, public InvalidationHandler { const WeakHandle debug_info_listener, std::unique_ptr model_type_connector, const std::string& cache_guid, - const std::string& session_name, const std::string& birthday, const std::string& bag_of_chips); diff --git a/components/sync/driver/glue/sync_engine_impl_unittest.cc b/components/sync/driver/glue/sync_engine_impl_unittest.cc index 6c8a8e64e975a6..e8fdcbc1e51ea4 100644 --- a/components/sync/driver/glue/sync_engine_impl_unittest.cc +++ b/components/sync/driver/glue/sync_engine_impl_unittest.cc @@ -84,7 +84,6 @@ class TestSyncEngineHost : public SyncEngineHostStub { const std::string&, const std::string&, const std::string&, - const std::string&, bool success) override { EXPECT_EQ(expect_success_, success); set_engine_types_.Run(initial_types); diff --git a/components/sync/driver/profile_sync_service.cc b/components/sync/driver/profile_sync_service.cc index 54c9b4324a8985..dcabe1e3b796f0 100644 --- a/components/sync/driver/profile_sync_service.cc +++ b/components/sync/driver/profile_sync_service.cc @@ -823,7 +823,6 @@ void ProfileSyncService::OnEngineInitialized( const WeakHandle& js_backend, const WeakHandle& debug_info_listener, const std::string& cache_guid, - const std::string& session_name, const std::string& birthday, const std::string& bag_of_chips, bool success) { diff --git a/components/sync/driver/profile_sync_service.h b/components/sync/driver/profile_sync_service.h index 734d86e91df6e8..93e8adaf9ead58 100644 --- a/components/sync/driver/profile_sync_service.h +++ b/components/sync/driver/profile_sync_service.h @@ -160,7 +160,6 @@ class ProfileSyncService : public SyncService, const WeakHandle& js_backend, const WeakHandle& debug_info_listener, const std::string& cache_guid, - const std::string& session_name, const std::string& birthday, const std::string& bag_of_chips, bool success) override; diff --git a/components/sync/driver/profile_sync_service_startup_unittest.cc b/components/sync/driver/profile_sync_service_startup_unittest.cc index 458950844cf08c..27e3c87cd60083 100644 --- a/components/sync/driver/profile_sync_service_startup_unittest.cc +++ b/components/sync/driver/profile_sync_service_startup_unittest.cc @@ -634,8 +634,8 @@ TEST_F(ProfileSyncServiceStartupTest, FullStartupSequenceFirstTime) { ON_CALL(*sync_engine, IsInitialized()).WillByDefault(Return(true)); sync_service()->OnEngineInitialized(ModelTypeSet(), WeakHandle(), WeakHandle(), - "test-guid", "test-session-name", - "test-birthday", "test-bag-of-chips", + "test-guid", "test-birthday", + "test-bag-of-chips", /*success=*/true); ASSERT_TRUE(sync_service()->IsEngineInitialized()); EXPECT_EQ(SyncService::TransportState::PENDING_DESIRED_CONFIGURATION, @@ -714,8 +714,8 @@ TEST_F(ProfileSyncServiceStartupTest, FullStartupSequenceNthTime) { ON_CALL(*sync_engine, IsInitialized()).WillByDefault(Return(true)); sync_service()->OnEngineInitialized(ModelTypeSet(), WeakHandle(), WeakHandle(), - "test-guid", "test-session-name", - "test-birthday", "test-bag-of-chips", + "test-guid", "test-birthday", + "test-bag-of-chips", /*success=*/true); ON_CALL(*data_type_manager, state()) .WillByDefault(Return(DataTypeManager::CONFIGURING)); diff --git a/components/sync/engine/fake_sync_engine.cc b/components/sync/engine/fake_sync_engine.cc index 9124c2a7023de2..fe0631976d8116 100644 --- a/components/sync/engine/fake_sync_engine.cc +++ b/components/sync/engine/fake_sync_engine.cc @@ -12,7 +12,6 @@ namespace syncer { namespace { const char kTestCacheGuid[] = "test-guid"; -const char kTestSessionName[] = "test-session-name"; const char kTestBirthday[] = "1"; } // namespace @@ -25,8 +24,8 @@ void FakeSyncEngine::Initialize(InitParams params) { initialized_ = success; params.host->OnEngineInitialized(ModelTypeSet(), WeakHandle(), WeakHandle(), - kTestCacheGuid, kTestSessionName, - kTestBirthday, /*bag_of_chips=*/"", success); + kTestCacheGuid, kTestBirthday, + /*bag_of_chips=*/"", success); } bool FakeSyncEngine::IsInitialized() const { diff --git a/components/sync/engine/sync_engine_host.h b/components/sync/engine/sync_engine_host.h index 3fdfc6bf68a90c..c345abb5d7da17 100644 --- a/components/sync/engine/sync_engine_host.h +++ b/components/sync/engine/sync_engine_host.h @@ -41,7 +41,6 @@ class SyncEngineHost { const WeakHandle& js_backend, const WeakHandle& debug_info_listener, const std::string& cache_guid, - const std::string& session_name, const std::string& birthday, const std::string& bag_of_chips, bool success) = 0; diff --git a/components/sync/engine/sync_engine_host_stub.cc b/components/sync/engine/sync_engine_host_stub.cc index e3efc552f874b9..255e9a779b1db1 100644 --- a/components/sync/engine/sync_engine_host_stub.cc +++ b/components/sync/engine/sync_engine_host_stub.cc @@ -14,7 +14,6 @@ void SyncEngineHostStub::OnEngineInitialized( const WeakHandle& js_backend, const WeakHandle& debug_info_listener, const std::string& cache_guid, - const std::string& session_name, const std::string& birthday, const std::string& bag_of_chips, bool success) {} diff --git a/components/sync/engine/sync_engine_host_stub.h b/components/sync/engine/sync_engine_host_stub.h index 5db071c9f7265f..edb7928cb94b62 100644 --- a/components/sync/engine/sync_engine_host_stub.h +++ b/components/sync/engine/sync_engine_host_stub.h @@ -22,7 +22,6 @@ class SyncEngineHostStub : public SyncEngineHost { const WeakHandle& js_backend, const WeakHandle& debug_info_listener, const std::string& cache_guid, - const std::string& session_name, const std::string& birthday, const std::string& bag_of_chips, bool success) override;