Rest of the autofill work.

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2010 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 "chrome/browser/sync/profile_sync_service.h"
 
 #include <map>
 #include <set>
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util-inl.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/net/gaia/token_service.h"
+#include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h"
 #include "chrome/browser/sync/glue/change_processor.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/data_type_manager.h"
 #include "chrome/browser/sync/glue/session_data_type_controller.h"
 #include "chrome/browser/sync/profile_sync_factory.h"
 #include "chrome/browser/sync/signin_manager.h"
 #include "chrome/browser/sync/token_migrator.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/notification_details.h"
@@ skipping 321 matching lines @@
   pref_service->RegisterBooleanPref(prefs::kSyncAutofill, enable_by_default);
   pref_service->RegisterBooleanPref(prefs::kSyncThemes, enable_by_default);
   pref_service->RegisterBooleanPref(prefs::kSyncTypedUrls, enable_by_default);
   pref_service->RegisterBooleanPref(prefs::kSyncExtensions, enable_by_default);
   pref_service->RegisterBooleanPref(prefs::kSyncApps, enable_by_default);
   pref_service->RegisterBooleanPref(prefs::kSyncSessions, enable_by_default);
   pref_service->RegisterBooleanPref(prefs::kKeepEverythingSynced,
       enable_by_default);
   pref_service->RegisterBooleanPref(prefs::kSyncManaged, false);
   pref_service->RegisterStringPref(prefs::kEncryptionBootstrapToken, "");
+
+  // If you have never synced before until we have migrated autofill profile
+  // is disabled.
+  pref_service->RegisterBooleanPref(prefs::kSyncAutofill_profile, false);
+
+  pref_service->RegisterBooleanPref(prefs::kAutofillProfileMigrated, false);
 }
 
 void ProfileSyncService::ClearPreferences() {
   PrefService* pref_service = profile_->GetPrefs();
   pref_service->ClearPref(prefs::kSyncLastSyncedTime);
   pref_service->ClearPref(prefs::kSyncHasSetupCompleted);
   pref_service->ClearPref(prefs::kEncryptionBootstrapToken);
 
   // TODO(nick): The current behavior does not clear e.g. prefs::kSyncBookmarks.
   // Is that really what we want?
@@ skipping 162 matching lines @@
     syncable::ModelType data_type) {
   switch (data_type) {
     case syncable::BOOKMARKS:
       return prefs::kSyncBookmarks;
     case syncable::PASSWORDS:
       return prefs::kSyncPasswords;
     case syncable::PREFERENCES:
       return prefs::kSyncPreferences;
     case syncable::AUTOFILL:
       return prefs::kSyncAutofill;
+    case syncable::AUTOFILL_PROFILE:
+      return prefs::kSyncAutofill_profile;
+      break;
     case syncable::THEMES:
       return prefs::kSyncThemes;
     case syncable::TYPED_URLS:
       return prefs::kSyncTypedUrls;
     case syncable::EXTENSIONS:
       return prefs::kSyncExtensions;
     case syncable::APPS:
       return prefs::kSyncApps;
     case syncable::SESSIONS:
       return prefs::kSyncSessions;
@@ skipping 308 matching lines @@
   GetRegisteredDataTypes(&registered_types);
   for (int i = 0; i < syncable::MODEL_TYPE_COUNT; ++i) {
     syncable::ModelType model_type = syncable::ModelTypeFromInt(i);
     if (!registered_types.count(model_type))
       continue;
     const char* pref_name = GetPrefNameForDataType(model_type);
     if (!pref_name)
       continue;
     profile_->GetPrefs()->SetBoolean(pref_name,
         preferred_types.count(model_type) != 0);
+    if (syncable::AUTOFILL == model_type) {
+      if (profile_->GetPrefs()->GetBoolean(prefs::kAutofillProfileMigrated)) {
+        profile_->GetPrefs()->SetBoolean(prefs::kSyncAutofill_profile,
+            preferred_types.count(model_type) != 0);
+        syncable::ModelTypeSet registered_types;
+
+        // Now register autofill profile if necessary.
+        GetRegisteredDataTypes(&registered_types);
+        if (registered_types.count(syncable::AUTOFILL_PROFILE) == 0) {
+          RegisterDataTypeController(
+            new browser_sync::AutofillProfileDataTypeController(this->factory_,
+                profile_,
+                this));
+        }
+      } else {
+        profile_->GetPrefs()->SetBoolean(prefs::kSyncAutofill_profile, false);
+      }
+    }
   }
 
   // If we haven't initialized yet, don't configure the DTM as it could cause
   // association to start before a Directory has even been created.
   if (backend_initialized_)
     ConfigureDataTypeManager();
 }
 
+void ProfileSyncService::GetAllSyncableTypesForCurrentClientState(
+    syncable::ModelTypeSet* preferred_types) const {
+  
+  GetRegisteredDataTypes(preferred_types);
+
+  if (!profile_->GetPrefs()->GetBoolean(prefs::kAutofillProfileMigrated)) {
+    preferred_types->erase(syncable::AUTOFILL_PROFILE);
+  }
+
+  return;
+}
+
 void ProfileSyncService::GetPreferredDataTypes(
     syncable::ModelTypeSet* preferred_types) const {
   preferred_types->clear();
-
-  // Filter out any datatypes which aren't registered, or for which
-  // the preference can't be read.
-  syncable::ModelTypeSet registered_types;
-  GetRegisteredDataTypes(&registered_types);
   if (profile_->GetPrefs()->GetBoolean(prefs::kKeepEverythingSynced)) {
-    *preferred_types = registered_types;
+    GetAllSyncableTypesForCurrentClientState(preferred_types);
   } else {
+    // Filter out any datatypes which aren't registered, or for which
+    // the preference can't be read.
+    syncable::ModelTypeSet registered_types;
+    GetRegisteredDataTypes(&registered_types);
     for (int i = 0; i < syncable::MODEL_TYPE_COUNT; ++i) {
       syncable::ModelType model_type = syncable::ModelTypeFromInt(i);
       if (!registered_types.count(model_type))
         continue;
       const char* pref_name = GetPrefNameForDataType(model_type);
       if (!pref_name)
         continue;
       if (profile_->GetPrefs()->GetBoolean(pref_name))
         preferred_types->insert(model_type);
     }
@@ skipping 236 matching lines @@
   // is initialized, all enabled data types are consistent with one
   // another, and no unrecoverable error has transpired.
   if (unrecoverable_error_detected_)
     return false;
 
   if (!data_type_manager_.get())
     return false;
 
   return data_type_manager_->state() == DataTypeManager::CONFIGURED;
 }