Fixes to (formerly) crashing test ProfileSyncServiceAutofillTest.ServerChangeRace

chrome/browser/sync/profile_sync_service_autofill_unittest.cc

 // Copyright (c) 2011 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 <set>
 #include <string>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 79 matching lines @@
 using testing::Invoke;
 using testing::Mock;
 using testing::Return;
 using testing::SaveArg;
 using testing::SetArgumentPointee;
 
 namespace syncable {
 class Id;
 }
 
+class HistoryService;
+
 class AutofillTableMock : public AutofillTable {
  public:
   AutofillTableMock() : AutofillTable(NULL, NULL) {}
   MOCK_METHOD2(RemoveFormElement,
                bool(const string16& name, const string16& value));  // NOLINT
   MOCK_METHOD1(GetAllAutofillEntries,
                bool(std::vector<AutofillEntry>* entries));  // NOLINT
   MOCK_METHOD3(GetAutofillTimestamps,
                bool(const string16& name,  // NOLINT
                     const string16& value,
@@ skipping 16 matching lines @@
       : autofill_table_(autofill_table) {}
 
   virtual AutofillTable* GetAutofillTable() OVERRIDE {
     return autofill_table_;
   }
 
  private:
   AutofillTable* autofill_table_;
 };
 
-
 class ProfileSyncServiceAutofillTest;
 
 template<class AutofillProfile>
 syncable::ModelType GetModelType() {
   return syncable::UNSPECIFIED;
 }
 
 template<>
 syncable::ModelType GetModelType<AutofillEntry>() {
   return syncable::AUTOFILL;
@@ skipping 939 matching lines @@
   notifier->Notify(chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
                    content::Source<WebDataService>(web_data_service_.get()),
                    content::Details<AutofillProfileChange>(&change));
 
   std::vector<AutofillProfile> new_sync_profiles;
   ASSERT_TRUE(GetAutofillProfilesFromSyncDBUnderProfileNode(
       &new_sync_profiles));
   ASSERT_EQ(0U, new_sync_profiles.size());
 }
 
-// Crashy, http://crbug.com/57884
-TEST_F(ProfileSyncServiceAutofillTest, DISABLED_ServerChangeRace) {
-  EXPECT_CALL(autofill_table_, GetAllAutofillEntries(_)).WillOnce(Return(true));
-  EXPECT_CALL(autofill_table_, GetAutofillProfiles(_)).WillOnce(Return(true));
+TEST_F(ProfileSyncServiceAutofillTest, ServerChangeRace) {
+  // GetHistoryService() gets called indirectly, but the result is ignored, so
+  // it is safe to return NULL.
+  EXPECT_CALL(profile_, GetHistoryService(_)).
+      WillRepeatedly(Return(static_cast<HistoryService*>(NULL)));
+  // Once for MergeDataAndStartSyncing() and twice for ProcessSyncChanges(), via
+  // LoadAutofillData().
+  EXPECT_CALL(autofill_table_, GetAllAutofillEntries(_)).
+      Times(3).WillRepeatedly(Return(true));
+  // On the other hand Autofill and Autocomplete are separated now, so
+  // GetAutofillProfiles() should not be called.
+  EXPECT_CALL(autofill_table_, GetAutofillProfiles(_)).Times(0);
   EXPECT_CALL(autofill_table_, UpdateAutofillEntries(_)).
       WillRepeatedly(Return(true));
   EXPECT_CALL(*personal_data_manager_, Refresh()).Times(3);
   CreateRootHelper create_root(this, syncable::AUTOFILL);
   StartSyncService(create_root.callback(), false, syncable::AUTOFILL);
   ASSERT_TRUE(create_root.success());
 
   // (true, false) means we have to reset after |Signal|, init to unsignaled.
   scoped_ptr<WaitableEvent> wait_for_start(new WaitableEvent(true, false));
   scoped_ptr<WaitableEvent> wait_for_syncapi(new WaitableEvent(true, false));
@@ skipping 19 matching lines @@
   std::vector<AutofillEntry> sync_entries;
   std::vector<AutofillProfile> sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles));
   EXPECT_EQ(3U, sync_entries.size());
   EXPECT_EQ(0U, sync_profiles.size());
   for (size_t i = 0; i < sync_entries.size(); i++) {
     DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name()
              << ", " << sync_entries[i].key().value();
   }
 }