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

chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 64 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/protector/protector_service.h"
 #include "chrome/browser/protector/protector_service_factory.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/sessions/session_service_factory.h"
+#include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/link_infobar_delegate.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
@@ skipping 5013 matching lines @@
     sync_waiter_.reset(
         ProfileSyncServiceHarness::CreateAndAttach(browser->profile()));
   }
   if (!sync_waiter_->IsSyncAlreadySetup()) {
     reply.SendError("Not signed in to sync");
     return;
   }
   // Ensure that the profile sync service and sync backend host are initialized
   // before waiting for sync cycle completion. In cases where the browser is
   // restarted with sync enabled, these operations may still be in flight.
-  if (!browser->profile()->GetProfileSyncService()) {
+  if (ProfileSyncServiceFactory::GetInstance()->GetForProfile(
+          browser->profile()) == NULL) {
     reply.SendError("ProfileSyncService initialization failed.");
     return;
   }
   if (!sync_waiter_->service()->sync_initialized() &&
       !sync_waiter_->AwaitBackendInitialized()) {
     reply.SendError("Sync backend host initialization failed.");
     return;
   }
   if (!sync_waiter_->AwaitFullSyncCompletion("Waiting for sync cycle")) {
     reply.SendError("Sync cycle did not complete.");
@@ skipping 20 matching lines @@
     IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
   if (sync_waiter_.get() == NULL) {
     sync_waiter_.reset(
         ProfileSyncServiceHarness::CreateAndAttach(browser->profile()));
   }
   if (!sync_waiter_->IsSyncAlreadySetup()) {
     reply.SendError("Not signed in to sync");
     return;
   }
-  if (!browser->profile()->GetProfileSyncService()) {
+  if (ProfileSyncServiceFactory::GetInstance()->GetForProfile(
+          browser->profile()) == NULL) {
     reply.SendError("ProfileSyncService initialization failed.");
     return;
   }
   if (!sync_waiter_->AwaitSyncRestart()) {
     reply.SendError("Sync did not successfully restart.");
     return;
   }
   ProfileSyncService::Status status = sync_waiter_->GetStatus();
   if (status.summary == ProfileSyncService::Status::READY) {
     scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
@@ skipping 1688 matching lines @@
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }