mac: Clean up autofill integration with Address Book.

chrome/browser/sync/test/integration/two_client_preferences_sync_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/values.h"
 #include "chrome/browser/sync/test/integration/preferences_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
@@ skipping 362 matching lines @@
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(BooleanPrefMatches(prefs::kSafeBrowsingEnabled));
 
   ChangeBooleanPref(0, prefs::kSafeBrowsingEnabled);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kSafeBrowsingEnabled));
 }
 
 // TCM ID - 3624302.
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
-                       kAutofillAuxiliaryProfilesEnabled) {
+                       kAutofillAndroidAuxiliaryProfilesEnabled) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   DisableVerifier();
 
-  ASSERT_TRUE(
-      BooleanPrefMatches(autofill::prefs::kAutofillAuxiliaryProfilesEnabled));
+  ASSERT_TRUE(BooleanPrefMatches(
+      autofill::prefs::kAutofillAndroidAuxiliaryProfilesEnabled));
 
-  ChangeBooleanPref(0, autofill::prefs::kAutofillAuxiliaryProfilesEnabled);
+  ChangeBooleanPref(0,
+                    autofill::prefs::kAutofillAndroidAuxiliaryProfilesEnabled);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
-  // kAutofillAuxiliaryProfilesEnabled is only synced on Mac.
-#if defined(OS_MACOSX)
-  ASSERT_TRUE(
-      BooleanPrefMatches(autofill::prefs::kAutofillAuxiliaryProfilesEnabled));
+  // kAutofillAndroidAuxiliaryProfilesEnabled is only synced on Android.
+#if defined(OS_ANDROID)
+  ASSERT_TRUE(BooleanPrefMatches(
+      autofill::prefs::kAutofillAndroidAuxiliaryProfilesEnabled));
 #else
-  ASSERT_FALSE(
-      BooleanPrefMatches(autofill::prefs::kAutofillAuxiliaryProfilesEnabled));
-#endif  // OS_MACOSX
+  ASSERT_FALSE(BooleanPrefMatches(
+      autofill::prefs::kAutofillAndroidAuxiliaryProfilesEnabled));
+#endif  // OS_ANDROID
 }
 
 // TCM ID - 3717298.
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kPromptForDownload) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_TRUE(BooleanPrefMatches(prefs::kPromptForDownload));
 
   ChangeBooleanPref(0, prefs::kPromptForDownload);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kPromptForDownload));
@@ skipping 210 matching lines @@
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(IsEncryptionComplete(0));
   ASSERT_TRUE(IsEncryptionComplete(1));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
 
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
 }