Update To 11.40.268.0

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

diff --git a/src/chrome/browser/sync/sync_ui_util_unittest.cc b/src/chrome/browser/sync/sync_ui_util_unittest.cc
index dbee15a..212e7be 100644 (file)
--- a/src/chrome/browser/sync/sync_ui_util_unittest.cc
+++ b/src/chrome/browser/sync/sync_ui_util_unittest.cc
@@ -181,12 +181,9 @@ class FakeSigninManagerForSyncUIUtilTest : public FakeSigninManagerBase {
     Initialize(NULL);
   }
 
-  virtual ~FakeSigninManagerForSyncUIUtilTest() {
-  }
+  ~FakeSigninManagerForSyncUIUtilTest() override {}
 
-  virtual bool AuthInProgress() const OVERRIDE {
-    return auth_in_progress_;
-  }
+  bool AuthInProgress() const override { return auth_in_progress_; }
 
   void set_auth_in_progress() {
     auth_in_progress_ = true;
@@ -233,7 +230,7 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
     case STATUS_CASE_AUTHENTICATING: {
       EXPECT_CALL(service, HasSyncSetupCompleted())
                   .WillRepeatedly(Return(true));
-      EXPECT_CALL(service, sync_initialized()).WillRepeatedly(Return(true));
+      EXPECT_CALL(service, SyncActive()).WillRepeatedly(Return(true));
       EXPECT_CALL(service, IsPassphraseRequired())
                   .WillRepeatedly(Return(false));
       browser_sync::SyncBackendHost::Status status;
@@ -248,7 +245,7 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
     case STATUS_CASE_AUTH_ERROR: {
       EXPECT_CALL(service, HasSyncSetupCompleted())
                   .WillRepeatedly(Return(true));
-      EXPECT_CALL(service, sync_initialized()).WillRepeatedly(Return(true));
+      EXPECT_CALL(service, SyncActive()).WillRepeatedly(Return(true));
       EXPECT_CALL(service, IsPassphraseRequired())
                   .WillRepeatedly(Return(false));
       browser_sync::SyncBackendHost::Status status;
@@ -266,7 +263,7 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
     case STATUS_CASE_PROTOCOL_ERROR: {
       EXPECT_CALL(service, HasSyncSetupCompleted())
                   .WillRepeatedly(Return(true));
-      EXPECT_CALL(service, sync_initialized()).WillRepeatedly(Return(true));
+      EXPECT_CALL(service, SyncActive()).WillRepeatedly(Return(true));
       EXPECT_CALL(service, IsPassphraseRequired())
                   .WillRepeatedly(Return(false));
       syncer::SyncProtocolError protocolError;
@@ -283,7 +280,7 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
     case STATUS_CASE_PASSPHRASE_ERROR: {
       EXPECT_CALL(service, HasSyncSetupCompleted())
                   .WillRepeatedly(Return(true));
-      EXPECT_CALL(service, sync_initialized()).WillRepeatedly(Return(true));
+      EXPECT_CALL(service, SyncActive()).WillRepeatedly(Return(true));
       browser_sync::SyncBackendHost::Status status;
       EXPECT_CALL(service, QueryDetailedSyncStatus(_))
                   .WillRepeatedly(DoAll(SetArgPointee<0>(status),
@@ -299,7 +296,7 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
     case STATUS_CASE_SYNCED: {
       EXPECT_CALL(service, HasSyncSetupCompleted())
               .WillRepeatedly(Return(true));
-      EXPECT_CALL(service, sync_initialized()).WillRepeatedly(Return(true));
+      EXPECT_CALL(service, SyncActive()).WillRepeatedly(Return(true));
       EXPECT_CALL(service, IsPassphraseRequired())
                   .WillRepeatedly(Return(false));
       browser_sync::SyncBackendHost::Status status;
@@ -316,7 +313,7 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
       EXPECT_CALL(service, IsManaged()).WillRepeatedly(Return(true));
       EXPECT_CALL(service, HasSyncSetupCompleted())
           .WillRepeatedly(Return(false));
-      EXPECT_CALL(service, sync_initialized()).WillRepeatedly(Return(false));
+      EXPECT_CALL(service, SyncActive()).WillRepeatedly(Return(false));
       EXPECT_CALL(service, IsPassphraseRequired())
                   .WillRepeatedly(Return(false));
       browser_sync::SyncBackendHost::Status status;