Extract abstract base to API directory for ProfileSyncService.

chrome/browser/autofill/personal_data_manager.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 "chrome/browser/autofill/personal_data_manager.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/api/prefs/pref_service_base.h"
+#include "chrome/browser/api/sync/profile_sync_service_base.h"
+#include "chrome/browser/api/webdata/autofill_web_data_service.h"
 #include "chrome/browser/autofill/autofill-inl.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/autofill_metrics.h"
 #include "chrome/browser/autofill/autofill_regexes.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/autofill/personal_data_manager_observer.h"
 #include "chrome/browser/autofill/phone_number.h"
 #include "chrome/browser/autofill/phone_number_i18n.h"
 #include "chrome/browser/autofill/select_control_handler.h"
-#include "chrome/browser/api/prefs/pref_service_base.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_source.h"
 
 using content::BrowserContext;
 
 namespace {
 
 template<typename T>
 class FormGroupMatchesByGUIDFunctor {
  public:
@@ skipping 121 matching lines @@
     std::vector<AutofillProfile*> profile_pointers(web_profiles_.size());
     std::copy(web_profiles_.begin(), web_profiles_.end(),
               profile_pointers.begin());
     AutofillProfile::AdjustInferredLabels(&profile_pointers);
     FOR_EACH_OBSERVER(PersonalDataManagerObserver, observers_,
                       OnPersonalDataChanged());
 
     // As all Autofill data is ready, the Autocomplete data is ready as well.
     // If sync is not set, cull older entries of the autocomplete. Otherwise,
     // the entries will be culled when sync is connected.
-    ProfileSyncService* sync_service =
-        ProfileSyncServiceFactory::GetInstance()->GetForProfile(
-            static_cast<Profile*>(browser_context_));
+    ProfileSyncServiceBase* sync_service =
+        ProfileSyncServiceBase::ForContext(browser_context_);
     if (sync_service && (!sync_service->HasSyncSetupCompleted() ||
                          !PrefServiceBase::ForContext(
                              browser_context_)->GetBoolean(
                                  prefs::kSyncAutofill))) {
       scoped_ptr<AutofillWebDataService> service(
           AutofillWebDataService::ForContext(browser_context_));
       if (service.get())
         service->RemoveExpiredFormElements();
     }
   }
@@ skipping 19 matching lines @@
   if (!browser_context_ || browser_context_->IsOffTheRecord())
     return;
 
   scoped_ptr<AutofillWebDataService> autofill_data(
       AutofillWebDataService::ForContext(browser_context_));
   if (!autofill_data.get()) {
     NOTREACHED();
     return;
   }
 
-  ProfileSyncService* sync_service =
-      ProfileSyncServiceFactory::GetInstance()->GetForProfile(
-          static_cast<Profile*>(browser_context_));
+  ProfileSyncServiceBase* sync_service =
+      ProfileSyncServiceBase::ForContext(browser_context_);
   if (!sync_service)
     return;
 
   if (sync_service->ShouldPushChanges()) {
     autofill_data->EmptyMigrationTrash(true);
     sync_service->RemoveObserver(this);
   }
 }
 
 void PersonalDataManager::Shutdown() {
@@ skipping 693 matching lines @@
   if (!browser_context_ || browser_context_->IsOffTheRecord())
     return;
 
   scoped_ptr<AutofillWebDataService> autofill_data(
       AutofillWebDataService::ForContext(browser_context_));
   if (!autofill_data.get()) {
     NOTREACHED();
     return;
   }
 
-  ProfileSyncService* sync_service =
-      ProfileSyncServiceFactory::GetInstance()->GetForProfile(
-          static_cast<Profile*>(browser_context_));
+  ProfileSyncServiceBase* sync_service =
+      ProfileSyncServiceBase::ForContext(browser_context_);
   if (!sync_service)
     return;
 
   if (!sync_service->HasSyncSetupCompleted()) {
     autofill_data->EmptyMigrationTrash(false);
   } else if (sync_service->ShouldPushChanges()) {
     autofill_data->EmptyMigrationTrash(true);
   } else {
     // Install ourself as a listener so we can empty the trash once the
     // sync service becomes available.
@@ skipping 10 matching lines @@
 }
 
 const AutofillMetrics* PersonalDataManager::metric_logger() const {
   return metric_logger_.get();
 }
 
 void PersonalDataManager::set_metric_logger(
     const AutofillMetrics* metric_logger) {
   metric_logger_.reset(metric_logger);
 }