Convert Sync BirthdayErrorTest to use FakeServer

chrome/browser/sync/test/integration/sync_errors_test.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/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/passwords_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
@@ skipping 26 matching lines @@
 };
 
 bool AwaitSyncDisabled(ProfileSyncService* service) {
   SyncDisabledChecker checker(service);
   checker.Wait();
   return !checker.TimedOut();
 }
 
 class SyncErrorTest : public SyncTest {
  public:
-  // TODO(pvalenzuela): Switch to SINGLE_CLIENT once FakeServer
-  // supports this scenario.
-  SyncErrorTest() : SyncTest(SINGLE_CLIENT_LEGACY) {}
+  SyncErrorTest() : SyncTest(SINGLE_CLIENT) {}
   virtual ~SyncErrorTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SyncErrorTest);
 };
 
+// TODO(pvalenzuela): Remove this class when all tests here are converted to
+// use FakeServer.
+class LegacySyncErrorTest : public SyncTest {
+ public:
+  LegacySyncErrorTest() : SyncTest(SINGLE_CLIENT_LEGACY) {}
+  virtual ~LegacySyncErrorTest() {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(LegacySyncErrorTest);
+};
+
 // Helper class that waits until the sync engine has hit an actionable error.
 class ActionableErrorChecker : public SingleClientStatusChangeChecker {
  public:
   explicit ActionableErrorChecker(ProfileSyncService* service)
       : SingleClientStatusChangeChecker(service) {}
 
   virtual ~ActionableErrorChecker() {}
 
   // Checks if an actionable error has been hit. Called repeatedly each time PSS
   // notifies observers of a state change.
@@ skipping 12 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ActionableErrorChecker);
 };
 
 IN_PROC_BROWSER_TEST_F(SyncErrorTest, BirthdayErrorTest) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Add an item, wait for sync, and trigger a birthday error on the server.
   const BookmarkNode* node1 = AddFolder(0, 0, L"title1");
   SetTitle(0, node1, L"new_title1");
   ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
-  TriggerBirthdayError();
+  ASSERT_TRUE(GetFakeServer()->SetNewStoreBirthday("new store birthday"));
 
   // Now make one more change so we will do another sync.
   const BookmarkNode* node2 = AddFolder(0, 0, L"title2");
   SetTitle(0, node2, L"new_title2");
   ASSERT_TRUE(AwaitSyncDisabled(GetSyncService((0))));
 }
 
-IN_PROC_BROWSER_TEST_F(SyncErrorTest, ActionableErrorTest) {
+IN_PROC_BROWSER_TEST_F(LegacySyncErrorTest, ActionableErrorTest) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   const BookmarkNode* node1 = AddFolder(0, 0, L"title1");
   SetTitle(0, node1, L"new_title1");
   ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
 
   syncer::SyncProtocolError protocol_error;
   protocol_error.error_type = syncer::TRANSIENT_ERROR;
   protocol_error.action = syncer::UPGRADE_CLIENT;
   protocol_error.error_description = "Not My Fault";
@@ skipping 12 matching lines @@
   ProfileSyncService::Status status;
   GetSyncService((0))->QueryDetailedSyncStatus(&status);
   ASSERT_EQ(status.sync_protocol_error.error_type, protocol_error.error_type);
   ASSERT_EQ(status.sync_protocol_error.action, protocol_error.action);
   ASSERT_EQ(status.sync_protocol_error.url, protocol_error.url);
   ASSERT_EQ(status.sync_protocol_error.error_description,
       protocol_error.error_description);
 }
 
 // Disabled, http://crbug.com/351160 .
-IN_PROC_BROWSER_TEST_F(SyncErrorTest, DISABLED_ErrorWhileSettingUp) {
+IN_PROC_BROWSER_TEST_F(LegacySyncErrorTest, DISABLED_ErrorWhileSettingUp) {
   ASSERT_TRUE(SetupClients());
 
   syncer::SyncProtocolError protocol_error;
   protocol_error.error_type = syncer::TRANSIENT_ERROR;
   protocol_error.error_description = "Not My Fault";
   protocol_error.url = "www.google.com";
 
   if (GetSyncService(0)->auto_start_enabled()) {
     // In auto start enabled platforms like chrome os we should be
     // able to set up even if the first sync while setting up fails.
     // Trigger error on every 2 out of 3 requests.
     TriggerSyncError(protocol_error, SyncTest::ERROR_FREQUENCY_TWO_THIRDS);
     // Now setup sync and it should succeed.
     ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   } else {
     // In Non auto start enabled environments if the setup sync fails then
     // the setup would fail. So setup sync normally.
     ASSERT_TRUE(SetupSync()) << "Setup sync failed";
     ASSERT_TRUE(GetClient(0)->DisableSyncForDatatype(syncer::AUTOFILL));
 
     // Trigger error on every 2 out of 3 requests.
     TriggerSyncError(protocol_error, SyncTest::ERROR_FREQUENCY_TWO_THIRDS);
 
     // Now enable a datatype, whose first 2 syncs would fail, but we should
     // recover and setup succesfully on the third attempt.
     ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(syncer::AUTOFILL));
   }
 }
 
-IN_PROC_BROWSER_TEST_F(SyncErrorTest,
+IN_PROC_BROWSER_TEST_F(LegacySyncErrorTest,
     BirthdayErrorUsingActionableErrorTest) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   const BookmarkNode* node1 = AddFolder(0, 0, L"title1");
   SetTitle(0, node1, L"new_title1");
   ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
 
   syncer::SyncProtocolError protocol_error;
   protocol_error.error_type = syncer::NOT_MY_BIRTHDAY;
   protocol_error.action = syncer::DISABLE_SYNC_ON_CLIENT;
   protocol_error.error_description = "Not My Fault";
   protocol_error.url = "www.google.com";
   TriggerSyncError(protocol_error, SyncTest::ERROR_FREQUENCY_ALWAYS);
 
   // Now make one more change so we will do another sync.
   const BookmarkNode* node2 = AddFolder(0, 0, L"title2");
   SetTitle(0, node2, L"new_title2");
   ASSERT_TRUE(AwaitSyncDisabled(GetSyncService((0))));
   ProfileSyncService::Status status;
   GetSyncService((0))->QueryDetailedSyncStatus(&status);
   ASSERT_EQ(status.sync_protocol_error.error_type, protocol_error.error_type);
   ASSERT_EQ(status.sync_protocol_error.action, protocol_error.action);
   ASSERT_EQ(status.sync_protocol_error.url, protocol_error.url);
   ASSERT_EQ(status.sync_protocol_error.error_description,
       protocol_error.error_description);
 }
 
 // TODO(lipalani): Fix the typed_url dtc so this test case can pass.
-IN_PROC_BROWSER_TEST_F(SyncErrorTest, DISABLED_DisableDatatypeWhileRunning) {
+IN_PROC_BROWSER_TEST_F(LegacySyncErrorTest,
+                       DISABLED_DisableDatatypeWhileRunning) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   syncer::ModelTypeSet synced_datatypes =
       GetSyncService((0))->GetPreferredDataTypes();
   ASSERT_TRUE(synced_datatypes.Has(syncer::TYPED_URLS));
   GetProfile(0)->GetPrefs()->SetBoolean(
       prefs::kSavingBrowserHistoryDisabled, true);
 
   synced_datatypes = GetSyncService((0))->GetPreferredDataTypes();
   ASSERT_FALSE(synced_datatypes.Has(syncer::TYPED_URLS));
 
   const BookmarkNode* node1 = AddFolder(0, 0, L"title1");
   SetTitle(0, node1, L"new_title1");
   ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
   // TODO(lipalani)" Verify initial sync ended for typed url is false.
 }
 
 }  // namespace