Remove a bunch of GetProfileSyncService callers to use the new factory.

chrome/browser/autofill/personal_data_manager.cc

 // Copyright (c) 2011 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/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/prefs/pref_service.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/browser/webdata/web_data_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_source.h"
 
 namespace {
 
 template<typename T>
 class FormGroupMatchesByGUIDFunctor {
@@ skipping 148 matching lines @@
   if (!profile_ || profile_->IsOffTheRecord())
     return;
 
   WebDataService* web_data_service =
       profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!web_data_service) {
     NOTREACHED();
     return;
   }
 
-  ProfileSyncService* sync_service = profile_->GetProfileSyncService();
+  ProfileSyncService* sync_service =
+      ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile_);
   if (!sync_service)
     return;
 
   if (sync_service->ShouldPushChanges()) {
     web_data_service->EmptyMigrationTrash(true);
     sync_service->RemoveObserver(this);
   }
 }
 
 void PersonalDataManager::Shutdown() {
@@ skipping 679 matching lines @@
   if (!profile_ || profile_->IsOffTheRecord())
     return;
 
   WebDataService* web_data_service =
       profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!web_data_service) {
     NOTREACHED();
     return;
   }
 
-  ProfileSyncService* sync_service = profile_->GetProfileSyncService();
+  ProfileSyncService* sync_service =
+      ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile_);
   if (!sync_service)
     return;
 
   if (!sync_service->HasSyncSetupCompleted()) {
     web_data_service->EmptyMigrationTrash(false);
   } else if (sync_service->ShouldPushChanges()) {
     web_data_service->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);
 }