Remove dependency of PrefSyncableService on Profile.

chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc

 // Copyright 2014 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/chromeos/login/users/avatar/user_image_sync_observer.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
+#include "chrome/browser/prefs/pref_service_syncable_util.h"
 #include "chrome/common/pref_names.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_image/default_user_images.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 
 namespace chromeos {
 namespace {
 
@@ skipping 47 matching lines @@
 
 void UserImageSyncObserver::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void UserImageSyncObserver::RemoveObserver(Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 void UserImageSyncObserver::OnProfileGained(Profile* profile) {
-  prefs_ = PrefServiceSyncable::FromProfile(profile);
+  prefs_ = PrefServiceSyncableFromProfile(profile);
   pref_change_registrar_.reset(new PrefChangeRegistrar);
   pref_change_registrar_->Init(prefs_);
   pref_change_registrar_->Add(kUserImageInfo,
       base::Bind(&UserImageSyncObserver::OnPreferenceChanged,
                  base::Unretained(this)));
   is_synced_ = prefs_->IsPrioritySyncing();
   if (!is_synced_) {
     prefs_->AddObserver(this);
   } else {
     OnInitialSync();
@@ skipping 97 matching lines @@
     if (wizard_controller->current_screen() == screen) {
       if (screen->user_selected_image())
         return false;
     }
   }
   return true;
 }
 
 }  // namespace chromeos