Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / sync / one_click_signin_sync_observer_unittest.cc

diff --git a/src/chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc b/src/chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc
index 5b7750a..3de0868 100644 (file)
--- a/src/chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc
+++ b/src/chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc
@@ -43,7 +43,7 @@ class MockWebContentsObserver : public content::WebContentsObserver {
 
 class OneClickTestProfileSyncService : public TestProfileSyncService {
  public:
-  virtual ~OneClickTestProfileSyncService() {}
+  ~OneClickTestProfileSyncService() override {}
 
   // Helper routine to be used in conjunction with
   // BrowserContextKeyedServiceFactory::SetTestingFactory().
@@ -51,18 +51,18 @@ class OneClickTestProfileSyncService : public TestProfileSyncService {
     return new OneClickTestProfileSyncService(static_cast<Profile*>(profile));
   }
 
-  virtual bool FirstSetupInProgress() const OVERRIDE {
+  bool FirstSetupInProgress() const override {
     return first_setup_in_progress_;
   }
 
-  virtual bool sync_initialized() const OVERRIDE { return sync_initialized_; }
+  bool SyncActive() const override { return sync_active_; }
 
   void set_first_setup_in_progress(bool in_progress) {
     first_setup_in_progress_ = in_progress;
   }
 
-  void set_sync_initialized(bool initialized) {
-    sync_initialized_ = initialized;
+  void set_sync_active(bool active) {
+    sync_active_ = active;
   }
 
  private:
@@ -75,10 +75,10 @@ class OneClickTestProfileSyncService : public TestProfileSyncService {
           ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
           browser_sync::MANUAL_START),
         first_setup_in_progress_(false),
-        sync_initialized_(false) {}
+        sync_active_(false) {}
 
   bool first_setup_in_progress_;
-  bool sync_initialized_;
+  bool sync_active_;
 };
 
 class TestOneClickSigninSyncObserver : public OneClickSigninSyncObserver {
@@ -91,7 +91,9 @@ class TestOneClickSigninSyncObserver : public OneClickSigninSyncObserver {
                                  const DestructionCallback& callback)
       : OneClickSigninSyncObserver(web_contents, continue_url),
         destruction_callback_(callback) {}
-  virtual ~TestOneClickSigninSyncObserver() { destruction_callback_.Run(this); }
+  ~TestOneClickSigninSyncObserver() override {
+    destruction_callback_.Run(this);
+  }
 
  private:
   DestructionCallback destruction_callback_;
@@ -113,7 +115,7 @@ class OneClickSigninSyncObserverTest : public ChromeRenderViewHostTestHarness {
         sync_observer_(NULL),
         sync_observer_destroyed_(true) {}
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     web_contents_observer_.reset(new MockWebContentsObserver(web_contents()));
     sync_service_ =
@@ -122,7 +124,7 @@ class OneClickSigninSyncObserverTest : public ChromeRenderViewHostTestHarness {
                 profile(), OneClickTestProfileSyncService::Build));
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() override {
     // Verify that the |sync_observer_| unregistered as an observer from the
     // sync service and freed its memory.
     EXPECT_TRUE(sync_observer_destroyed_);
@@ -190,7 +192,7 @@ TEST_F(OneClickSigninSyncObserverTest,
        OnSyncStateChanged_SyncConfiguredSuccessfully) {
   CreateSyncObserver(kContinueUrl);
   sync_service_->set_first_setup_in_progress(false);
-  sync_service_->set_sync_initialized(true);
+  sync_service_->set_sync_active(true);
 
   EXPECT_CALL(*web_contents_observer_, AboutToNavigateRenderView(_));
   sync_service_->NotifyObservers();
@@ -203,7 +205,7 @@ TEST_F(OneClickSigninSyncObserverTest,
        OnSyncStateChanged_SyncConfigurationFailed) {
   CreateSyncObserver(kContinueUrl);
   sync_service_->set_first_setup_in_progress(false);
-  sync_service_->set_sync_initialized(false);
+  sync_service_->set_sync_active(false);
 
   EXPECT_CALL(*web_contents_observer_, AboutToNavigateRenderView(_)).Times(0);
   sync_service_->NotifyObservers();
@@ -216,7 +218,7 @@ TEST_F(OneClickSigninSyncObserverTest,
        OnSyncStateChanged_SyncConfigurationInProgress) {
   CreateSyncObserver(kContinueUrl);
   sync_service_->set_first_setup_in_progress(true);
-  sync_service_->set_sync_initialized(false);
+  sync_service_->set_sync_active(false);
 
   EXPECT_CALL(*web_contents_observer_, AboutToNavigateRenderView(_)).Times(0);
   sync_service_->NotifyObservers();
@@ -233,7 +235,7 @@ TEST_F(OneClickSigninSyncObserverTest,
   GURL continue_url = signin::GetPromoURL(signin::SOURCE_SETTINGS, false);
   CreateSyncObserver(continue_url.spec());
   sync_service_->set_first_setup_in_progress(false);
-  sync_service_->set_sync_initialized(true);
+  sync_service_->set_sync_active(true);
 
   EXPECT_CALL(*web_contents_observer_, AboutToNavigateRenderView(_)).Times(0);
   sync_service_->NotifyObservers();