Move AutofillProfileSyncableService into the Autofill component.

chrome/browser/webdata/autofill_profile_syncable_service.h

Index: chrome/browser/webdata/autofill_profile_syncable_service.h
diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.h b/chrome/browser/webdata/autofill_profile_syncable_service.h
deleted file mode 100644
index 77f9b52c6e1a7ebb4b39724e2f4a0f39cc65978b..0000000000000000000000000000000000000000
--- a/chrome/browser/webdata/autofill_profile_syncable_service.h
+++ /dev/null
@@ -1,218 +0,0 @@
-// 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.
-#ifndef CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
-#define CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
-
-#include <map>
-#include <string>
-#include <vector>
-
-#include "base/basictypes.h"
-#include "base/memory/scoped_vector.h"
-#include "base/scoped_observer.h"
-#include "base/supports_user_data.h"
-#include "base/synchronization/lock.h"
-#include "base/threading/non_thread_safe.h"
-#include "components/autofill/core/browser/field_types.h"
-#include "components/autofill/core/browser/webdata/autofill_change.h"
-#include "components/autofill/core/browser/webdata/autofill_entry.h"
-#include "components/autofill/core/browser/webdata/autofill_webdata_backend.h"
-#include "components/autofill/core/browser/webdata/autofill_webdata_service_observer.h"
-#include "sync/api/sync_change.h"
-#include "sync/api/sync_data.h"
-#include "sync/api/sync_error.h"
-#include "sync/api/syncable_service.h"
-#include "sync/protocol/autofill_specifics.pb.h"
-
-class ProfileSyncServiceAutofillTest;
-class WebDataServiceBase;
-
-namespace autofill {
-
-class AutofillProfile;
-class AutofillTable;
-class AutofillWebDataService;
-class FormGroup;
-
-extern const char kAutofillProfileTag[];
-
-// The sync implementation for AutofillProfiles.
-// MergeDataAndStartSyncing() called first, it does cloud->local and
-// local->cloud syncs. Then for each cloud change we receive
-// ProcessSyncChanges() and for each local change Observe() is called.
-class AutofillProfileSyncableService
-    : public base::SupportsUserData::Data,
-      public syncer::SyncableService,
-      public AutofillWebDataServiceObserverOnDBThread,
-      public base::NonThreadSafe {
- public:
-  virtual ~AutofillProfileSyncableService();
-
-  // Creates a new AutofillProfileSyncableService and hangs it off of
-  // |web_data_service|, which takes ownership.
-  static void CreateForWebDataServiceAndBackend(
-      AutofillWebDataService* web_data_service,
-      AutofillWebDataBackend* webdata_backend,
-      const std::string& app_locale);
-
-  // Retrieves the AutofillProfileSyncableService stored on |web_data_service|.
-  static AutofillProfileSyncableService* FromWebDataService(
-      AutofillWebDataService* web_data_service);
-
-  static syncer::ModelType model_type() { return syncer::AUTOFILL_PROFILE; }
-
-  // syncer::SyncableService implementation.
-  virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
-      syncer::ModelType type,
-      const syncer::SyncDataList& initial_sync_data,
-      scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
-      scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) OVERRIDE;
-  virtual void StopSyncing(syncer::ModelType type) OVERRIDE;
-  virtual syncer::SyncDataList GetAllSyncData(
-      syncer::ModelType type) const OVERRIDE;
-  virtual syncer::SyncError ProcessSyncChanges(
-      const tracked_objects::Location& from_here,
-      const syncer::SyncChangeList& change_list) OVERRIDE;
-
-  // AutofillWebDataServiceObserverOnDBThread implementation.
-  virtual void AutofillProfileChanged(
-      const AutofillProfileChange& change) OVERRIDE;
-
-  // Provides a StartSyncFlare to the SyncableService. See
-  // sync_start_util for more.
-  void InjectStartSyncFlare(
-      const syncer::SyncableService::StartSyncFlare& flare);
-
- protected:
-  AutofillProfileSyncableService(AutofillWebDataBackend* webdata_backend,
-                                 const std::string& app_locale);
-
-  // A convenience wrapper of a bunch of state we pass around while
-  // associating models, and send to the WebDatabase for persistence.
-  // We do this so we hold the write lock for only a small period.
-  // When storing the web db we are out of the write lock.
-  struct DataBundle;
-
-  // Helper to query WebDatabase for the current autofill state.
-  // Made virtual for ease of mocking in unit tests.
-  // Caller owns returned |profiles|.
-  virtual bool LoadAutofillData(std::vector<AutofillProfile*>* profiles);
-
-  // Helper to persist any changes that occured during model association to
-  // the WebDatabase.
-  // Made virtual for ease of mocking in unit tests.
-  virtual bool SaveChangesToWebData(const DataBundle& bundle);
-
-  // For unit tests.
-  AutofillProfileSyncableService();
-  void set_sync_processor(syncer::SyncChangeProcessor* sync_processor) {
-    sync_processor_.reset(sync_processor);
-  }
-
-  // Creates syncer::SyncData based on supplied |profile|.
-  // Exposed for unit tests.
-  static syncer::SyncData CreateData(const AutofillProfile& profile);
-
- private:
-  friend class ::ProfileSyncServiceAutofillTest;
-  FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest,
-                           UpdateField);
-  FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest,
-                           UpdateMultivaluedField);
-  FRIEND_TEST_ALL_PREFIXES(AutofillProfileSyncableServiceTest,
-                           MergeProfile);
-
-  // The map of the guid to profiles owned by the |profiles_| vector.
-  typedef std::map<std::string, AutofillProfile*> GUIDToProfileMap;
-
-  // Helper function that overwrites |profile| with data from proto-buffer
-  // |specifics|.
-  static bool OverwriteProfileWithServerData(
-      const sync_pb::AutofillProfileSpecifics& specifics,
-      AutofillProfile* profile,
-      const std::string& app_locale);
-
-  // Writes |profile| data into supplied |profile_specifics|.
-  static void WriteAutofillProfile(const AutofillProfile& profile,
-                                   sync_pb::EntitySpecifics* profile_specifics);
-
-  // Creates |profile_map| from the supplied |profiles| vector. Necessary for
-  // fast processing of the changes.
-  void CreateGUIDToProfileMap(const std::vector<AutofillProfile*>& profiles,
-                              GUIDToProfileMap* profile_map);
-
-  // Creates or updates a profile based on |data|. Looks at the guid of the data
-  // and if a profile with such guid is present in |profile_map| updates it. If
-  // not, searches through it for similar profiles. If similar profile is
-  // found substitutes it for the new one, otherwise adds a new profile. Returns
-  // iterator pointing to added/updated profile.
-  GUIDToProfileMap::iterator CreateOrUpdateProfile(
-      const syncer::SyncData& data,
-      GUIDToProfileMap* profile_map,
-      DataBundle* bundle);
-
-  // Syncs |change| to the cloud.
-  void ActOnChange(const AutofillProfileChange& change);
-
-  AutofillTable* GetAutofillTable() const;
-
-  // Helper to compare the local value and cloud value of a field, copy into
-  // the local value if they differ, and return whether the change happened.
-  static bool UpdateField(ServerFieldType field_type,
-                          const std::string& new_value,
-                          AutofillProfile* autofill_profile);
-  // The same as |UpdateField|, but for multi-valued fields.
-  static bool UpdateMultivaluedField(
-      ServerFieldType field_type,
-      const ::google::protobuf::RepeatedPtrField<std::string>& new_value,
-      AutofillProfile* autofill_profile);
-
-  // Calls merge_into->OverwriteWithOrAddTo() and then checks if the
-  // |merge_into| has extra data. Returns |true| if |merge_into| posseses some
-  // multi-valued field values that are not in |merge_from| or if the origins
-  // of the two profiles differ, false otherwise.
-  // TODO(isherman): Seems like this should return |true| if |merge_into| was
-  // modified at all: http://crbug.com/248440
-  static bool MergeProfile(const AutofillProfile& merge_from,
-                           AutofillProfile* merge_into,
-                           const std::string& app_locale);
-
-  AutofillWebDataBackend* webdata_backend_;  // WEAK
-  std::string app_locale_;
-  ScopedObserver<AutofillWebDataBackend,
-                 AutofillProfileSyncableService> scoped_observer_;
-
-  // Cached Autofill profiles. *Warning* deleted profiles are still in the
-  // vector - use the |profiles_map_| to iterate through actual profiles.
-  ScopedVector<AutofillProfile> profiles_;
-  GUIDToProfileMap profiles_map_;
-
-  scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
-
-  scoped_ptr<syncer::SyncErrorFactory> sync_error_factory_;
-
-  syncer::SyncableService::StartSyncFlare flare_;
-
-  DISALLOW_COPY_AND_ASSIGN(AutofillProfileSyncableService);
-};
-
-// This object is used in unit tests as well, so it defined here.
-struct AutofillProfileSyncableService::DataBundle {
-  DataBundle();
-  ~DataBundle();
-
-  std::vector<std::string> profiles_to_delete;
-  std::vector<AutofillProfile*> profiles_to_update;
-  std::vector<AutofillProfile*> profiles_to_add;
-
-  // When we go through sync we find profiles that are similar but unmatched.
-  // Merge such profiles.
-  GUIDToProfileMap candidates_to_merge;
-  // Profiles that have multi-valued fields that are not in sync.
-  std::vector<AutofillProfile*> profiles_to_sync_back;
-};
-
-}  // namespace autofill
-
-#endif  // CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_