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

chrome/browser/extensions/app_notify_channel_ui.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/extensions/app_notify_channel_ui.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_tab_helper.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/sync/sync_setup_wizard.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
@@ skipping 87 matching lines @@
 
   InfoBarTabHelper* helper = wrapper_->infobar_tab_helper();
   helper->AddInfoBar(new AppNotifyChannelUIImpl::InfoBar(
       this, helper, app_name_));
 }
 
 void AppNotifyChannelUIImpl::OnInfoBarResult(bool accepted) {
   if (accepted) {
     StartObservingSync();
     ProfileSyncService* service =
-        browser_->profile()->GetOriginalProfile()->GetProfileSyncService();
+        ProfileSyncServiceFactory::GetInstance()->GetForProfile(
+            browser_->profile()->GetOriginalProfile());
     service->ShowLoginDialog();
   } else {
     delegate_->OnSyncSetupResult(false);
   }
 }
 
 void AppNotifyChannelUIImpl::OnStateChanged() {
+  // TODO(REVIEWERS): Why does this not use OriginalProfile but above we do?

[asargent_no_longer_on_chrome, 2012/01/27 00:49:20]

This (and all the others below) can use OriginalProfile

   ProfileSyncService* sync_service =
-      browser_->profile()->GetProfileSyncService();
+      ProfileSyncServiceFactory::GetInstance()->GetForProfile(
+          browser_->profile());
   bool wizard_visible = sync_service->WizardIsVisible();
   // ProfileSyncService raises OnStateChanged many times. Even multiple
   // times before the wizard actually becomes visible for the first time.
   // So we have to wait for the wizard to become visible once and then we
   // wait for it to get dismissed.
   bool finished = wizard_shown_to_user_ && !wizard_visible;
   if (wizard_visible)
     wizard_shown_to_user_ = true;
 
   if (finished) {
     StopObservingSync();
     delegate_->OnSyncSetupResult(sync_service->HasSyncSetupCompleted());
   }
 }
 
 void AppNotifyChannelUIImpl::StartObservingSync() {
   CHECK(!observing_sync_);
   observing_sync_ = true;
-  browser_->profile()->GetProfileSyncService()->AddObserver(this);
+  // TODO(REVIEWERS): Why does this not use OriginalProfile but above we do?
+  ProfileSyncServiceFactory::GetInstance()->GetForProfile(
+      browser_->profile())->AddObserver(this);
 }
 
 void AppNotifyChannelUIImpl::StopObservingSync() {
   CHECK(observing_sync_);
   observing_sync_ = false;
-  browser_->profile()->GetProfileSyncService()->RemoveObserver(this);
+  // TODO(REVIEWERS): Why does this not use OriginalProfile but above we do?
+  ProfileSyncServiceFactory::GetInstance()->GetForProfile(
+      browser_->profile())->RemoveObserver(this);
 }