Remove dependency of PrefSyncableService on Profile.

chrome/browser/extensions/external_pref_loader.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/extensions/external_pref_loader.h"
 
 #include "base/bind.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
+#include "chrome/browser/prefs/pref_service_syncable_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace {
 
 base::FilePath::CharType kExternalExtensionJson[] =
@@ skipping 84 matching lines @@
   // |base_path_| was set in LoadOnFileThread().
   return base_path_;
 }
 
 void ExternalPrefLoader::StartLoading() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if ((options_ & DELAY_LOAD_UNTIL_PRIORITY_SYNC) &&
       (profile_ && profile_->IsSyncAllowed())) {
     if (!PostLoadIfPrioritySyncReady()) {
       DCHECK(profile_);
-      PrefServiceSyncable* prefs = PrefServiceSyncable::FromProfile(profile_);
+      PrefServiceSyncable* prefs = PrefServiceSyncableFromProfile(profile_);
       DCHECK(prefs);
       syncable_pref_observer_.Add(prefs);
       ProfileSyncService* service =
           ProfileSyncServiceFactory::GetForProfile(profile_);
       DCHECK(service);
       if (service->CanSyncStart() &&
           (service->HasSyncSetupCompleted() ||
            browser_defaults::kSyncAutoStarts)) {
         service->AddObserver(this);
       } else {
@@ skipping 17 matching lines @@
   DCHECK(service);
   if (!service->CanSyncStart()) {
     PostLoadAndRemoveObservers();
   }
 }
 
 bool ExternalPrefLoader::PostLoadIfPrioritySyncReady() {
   DCHECK(options_ & DELAY_LOAD_UNTIL_PRIORITY_SYNC);
   DCHECK(profile_);
 
-  PrefServiceSyncable* prefs = PrefServiceSyncable::FromProfile(profile_);
+  PrefServiceSyncable* prefs = PrefServiceSyncableFromProfile(profile_);
   DCHECK(prefs);
   if (prefs->IsPrioritySyncing()) {
     PostLoadAndRemoveObservers();
     return true;
   }
 
   return false;
 }
 
 void ExternalPrefLoader::PostLoadAndRemoveObservers() {
-  PrefServiceSyncable* prefs = PrefServiceSyncable::FromProfile(profile_);
+  PrefServiceSyncable* prefs = PrefServiceSyncableFromProfile(profile_);
   DCHECK(prefs);
   syncable_pref_observer_.Remove(prefs);
 
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   DCHECK(service);
   service->RemoveObserver(this);
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
@@ skipping 136 matching lines @@
   LoadFinished();
 }
 
 ExternalTestingLoader::~ExternalTestingLoader() {}
 
 const base::FilePath ExternalTestingLoader::GetBaseCrxFilePath() {
   return fake_base_path_;
 }
 
 }  // namespace extensions