mac: Clean up autofill integration with Address Book.

components/autofill/core/browser/autofill_manager.cc

 // Copyright 2013 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 "components/autofill/core/browser/autofill_manager.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <map>
@@ skipping 183 matching lines @@
 
 AutofillManager::~AutofillManager() {}
 
 // static
 void AutofillManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kAutofillEnabled,
       true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-#if defined(OS_MACOSX) || defined(OS_ANDROID)
+#if defined(OS_ANDROID)
   registry->RegisterBooleanPref(
       prefs::kAutofillAuxiliaryProfilesEnabled,
       true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-#else  // defined(OS_MACOSX) || defined(OS_ANDROID)
+#else  // defined(OS_ANDROID)

[Ilya Sherman, 2014/05/30 23:39:48]

Hmm, what happens if the user enables access to their Android contacts, and also
uses a Mac?  I'm not sure how Sync handles prefs that are only syncable some of
the time.  (Before, syncing the pref to other platforms simply had no effect, so
this wasn't as relevant a question.)

[erikchen, 2014/06/02 21:21:17]

I've added a new pref for mac.

   registry->RegisterBooleanPref(
       prefs::kAutofillAuxiliaryProfilesEnabled,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 #endif  // defined(OS_MACOSX) || defined(OS_ANDROID)

[Ilya Sherman, 2014/05/30 23:39:48]

nit: Please update this comment.

[Ilya Sherman, 2014/05/30 23:39:48]

What happens to users who have already granted Chrome access to their Address
Book?  Will we be effectively turning off the feature for them?  It seems like
we should try to affect only those users who have not been prompted yet.

[erikchen, 2014/05/31 00:14:08]

ack. The logic in this CL for personal_data_manager_mac is not currently correct
(it doesn't bother checking the pref at all). To avoid confusion with android,
we should create a new pref and migrate over the old values. Is there a well
defined way for doing this? A quick search revealed:
session_startup_pref.cc::MigrateIfNecessary, should I copy it's format?

[Ilya Sherman, 2014/05/31 00:39:15]

Hmm, that looks a little more complicated than what we need, but otherwise
roughly right.  We essentially need (1) to check whether the migration has
already happened, and (2) if not, migrate the pref and record that the migration
has now happened.  One option would be to rename the pref on both Mac and
Android.  If we do that, then we can test (1) by checking for the existence of
the old pref, which we'd clear in step (2).

[erikchen, 2014/06/02 21:21:17]

I've added a new pref for mac, as well as a migration pref. The migration is
performed once on each installed instance of Chrome that's running OSX.

 #if defined(OS_MACOSX)
   registry->RegisterBooleanPref(
       prefs::kAutofillAuxiliaryProfilesQueried,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 #endif  // defined(OS_MACOSX)
   registry->RegisterDoublePref(
       prefs::kAutofillPositiveUploadRate,
       kAutofillPositiveUploadRateDefaultValue,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
@@ skipping 935 matching lines @@
     return false;
 
   // Disregard forms that we wouldn't ever autofill in the first place.
   if (!form.ShouldBeParsed(true))
     return false;
 
   return true;
 }
 
 }  // namespace autofill