sync: final pieces to sync deferred initialization

chrome/browser/sync/profile_sync_service_unittest.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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/invalidation/invalidation_service_factory.h"
@@ skipping 99 matching lines @@
 
     service_.reset();
     profile_.reset();
   }
 
   void IssueTestTokens() {
     ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get())
         ->UpdateCredentials("test", "oauth2_login_token");
   }
 
-  void CreateService(ProfileSyncService::StartBehavior behavior) {
+  void CreateService(ProfileSyncServiceStartBehavior behavior) {
     SigninManagerBase* signin =
         SigninManagerFactory::GetForProfile(profile_.get());
     signin->SetAuthenticatedUsername("test");
     ProfileOAuth2TokenService* oauth2_token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
     components_factory_ = new StrictMock<ProfileSyncComponentsFactoryMock>();
     service_.reset(new ProfileSyncService(
         components_factory_,
         profile_.get(),
         new ManagedUserSigninManagerWrapper(signin),
@@ skipping 43 matching lines @@
   scoped_ptr<ProfileSyncService> service_;
 
   // Pointer to the components factory.  Not owned.  May be null.
   ProfileSyncComponentsFactoryMock* components_factory_;
 
   content::TestBrowserThreadBundle thread_bundle_;
 };
 
 // Verify that the server URLs are sane.
 TEST_F(ProfileSyncServiceTest, InitialState) {
-  CreateService(ProfileSyncService::AUTO_START);
+  CreateService(browser_sync::AUTO_START);
   Initialize();
   const std::string& url = service()->sync_service_url().spec();
   EXPECT_TRUE(url == ProfileSyncService::kSyncServerUrl ||
               url == ProfileSyncService::kDevServerUrl);
 }
 
 // Verify a successful initialization.
 TEST_F(ProfileSyncServiceTest, SuccessfulInitialization) {
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kSyncManaged,
       base::Value::CreateBooleanValue(false));
   IssueTestTokens();
-  CreateService(ProfileSyncService::AUTO_START);
+  CreateService(browser_sync::AUTO_START);
   ExpectDataTypeManagerCreation();
   ExpectSyncBackendHostCreation();
   Initialize();
   EXPECT_FALSE(service()->IsManaged());
   EXPECT_TRUE(service()->sync_initialized());
 }
 
 
 // Verify that the SetSetupInProgress function call updates state
 // and notifies observers.
 TEST_F(ProfileSyncServiceTest, SetupInProgress) {
-  CreateService(ProfileSyncService::MANUAL_START);
+  CreateService(browser_sync::AUTO_START);
   Initialize();
 
   TestProfileSyncServiceObserver observer(service());
   service()->AddObserver(&observer);
 
   service()->SetSetupInProgress(true);
   EXPECT_TRUE(observer.first_setup_in_progress());
   service()->SetSetupInProgress(false);
   EXPECT_FALSE(observer.first_setup_in_progress());
 
   service()->RemoveObserver(&observer);
 }
 
 // Verify that disable by enterprise policy works.
 TEST_F(ProfileSyncServiceTest, DisabledByPolicyBeforeInit) {
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kSyncManaged,
       base::Value::CreateBooleanValue(true));
   IssueTestTokens();
-  CreateService(ProfileSyncService::AUTO_START);
+  CreateService(browser_sync::AUTO_START);
   Initialize();
   EXPECT_TRUE(service()->IsManaged());
   EXPECT_FALSE(service()->sync_initialized());
 }
 
 // Verify that disable by enterprise policy works even after the backend has
 // been initialized.
 TEST_F(ProfileSyncServiceTest, DisabledByPolicyAfterInit) {
   IssueTestTokens();
-  CreateService(ProfileSyncService::AUTO_START);
+  CreateService(browser_sync::AUTO_START);
   ExpectDataTypeManagerCreation();
   ExpectSyncBackendHostCreation();
   Initialize();
 
   EXPECT_FALSE(service()->IsManaged());
   EXPECT_TRUE(service()->sync_initialized());
 
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kSyncManaged,
       base::Value::CreateBooleanValue(true));
 
   EXPECT_TRUE(service()->IsManaged());
   EXPECT_FALSE(service()->sync_initialized());
 }
 
 // Exercies the ProfileSyncService's code paths related to getting shut down
 // before the backend initialize call returns.
 TEST_F(ProfileSyncServiceTest, AbortedByShutdown) {
-  CreateService(ProfileSyncService::AUTO_START);
+  CreateService(browser_sync::AUTO_START);
   PrepareDelayedInitSyncBackendHost();
 
   IssueTestTokens();
   Initialize();
   EXPECT_FALSE(service()->sync_initialized());
 
   ShutdownAndDeleteService();
 }
 
 // Test StopAndSuppress() before we've initialized the backend.
 TEST_F(ProfileSyncServiceTest, EarlyStopAndSuppress) {
-  CreateService(ProfileSyncService::AUTO_START);
+  CreateService(browser_sync::AUTO_START);
   IssueTestTokens();
 
   service()->StopAndSuppress();
   EXPECT_TRUE(profile()->GetPrefs()->GetBoolean(prefs::kSyncSuppressStart));
 
   // Because of supression, this should fail.
   Initialize();
   EXPECT_FALSE(service()->sync_initialized());
 
   // Remove suppression.  This should be enough to allow init to happen.
   ExpectDataTypeManagerCreation();
   ExpectSyncBackendHostCreation();
   service()->UnsuppressAndStart();
   EXPECT_TRUE(service()->sync_initialized());
   EXPECT_FALSE(
       profile()->GetPrefs()->GetBoolean(prefs::kSyncSuppressStart));
 }
 
 // Test StopAndSuppress() after we've initialized the backend.
 TEST_F(ProfileSyncServiceTest, DisableAndEnableSyncTemporarily) {
-  CreateService(ProfileSyncService::AUTO_START);
+  CreateService(browser_sync::AUTO_START);
   IssueTestTokens();
   ExpectDataTypeManagerCreation();
   ExpectSyncBackendHostCreation();
   Initialize();
 
   EXPECT_TRUE(service()->sync_initialized());
   EXPECT_FALSE(profile()->GetPrefs()->GetBoolean(prefs::kSyncSuppressStart));
 
   testing::Mock::VerifyAndClearExpectations(components_factory());
 
   service()->StopAndSuppress();
   EXPECT_FALSE(service()->sync_initialized());
   EXPECT_TRUE(profile()->GetPrefs()->GetBoolean(prefs::kSyncSuppressStart));
 
   ExpectDataTypeManagerCreation();
   ExpectSyncBackendHostCreation();
 
   service()->UnsuppressAndStart();
   EXPECT_TRUE(service()->sync_initialized());
   EXPECT_FALSE(
       profile()->GetPrefs()->GetBoolean(prefs::kSyncSuppressStart));
 }
 
 // Certain ProfileSyncService tests don't apply to Chrome OS, for example
 // things that deal with concepts like "signing out" and policy.
 #if !defined (OS_CHROMEOS)
 
 TEST_F(ProfileSyncServiceTest, EnableSyncAndSignOut) {
-  CreateService(ProfileSyncService::AUTO_START);
+  CreateService(browser_sync::AUTO_START);
   ExpectDataTypeManagerCreation();
   ExpectSyncBackendHostCreation();
   IssueTestTokens();
   Initialize();
 
   EXPECT_TRUE(service()->sync_initialized());
   EXPECT_FALSE(profile()->GetPrefs()->GetBoolean(prefs::kSyncSuppressStart));
 
   SigninManagerFactory::GetForProfile(profile())->SignOut();
   EXPECT_FALSE(service()->sync_initialized());
 }
 
 #endif  // !defined(OS_CHROMEOS)
 
 TEST_F(ProfileSyncServiceTest, GetSyncTokenStatus) {
-  CreateService(ProfileSyncService::AUTO_START);
+  CreateService(browser_sync::AUTO_START);
   IssueTestTokens();
   ExpectDataTypeManagerCreation();
   ExpectSyncBackendHostCreation();
   Initialize();
 
   // Initial status.
   ProfileSyncService::SyncTokenStatus token_status =
       service()->GetSyncTokenStatus();
   EXPECT_EQ(syncer::CONNECTION_NOT_ATTEMPTED, token_status.connection_status);
   EXPECT_TRUE(token_status.connection_status_update_time.is_null());
@@ skipping 17 matching lines @@
   EXPECT_TRUE(token_status.next_token_request_time.is_null());
 
   // Simulate successful connection.
   service()->OnConnectionStatusChange(syncer::CONNECTION_OK);
   token_status = service()->GetSyncTokenStatus();
   EXPECT_EQ(syncer::CONNECTION_OK, token_status.connection_status);
 }
 
 }  // namespace
 }  // namespace browser_sync