Remove dependency of PrefSyncableService on Profile.

chrome/browser/notifications/extension_welcome_notification.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/notifications/extension_welcome_notification.h"
 
 #include "base/guid.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/prefs/pref_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification.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/ui/browser_navigator.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/message_center.h"
@@ skipping 130 matching lines @@
 
 // static
 ExtensionWelcomeNotification* ExtensionWelcomeNotification::Create(
     Profile* const profile, Delegate* const delegate) {
   return new ExtensionWelcomeNotification(profile, delegate);
 }
 
 ExtensionWelcomeNotification::~ExtensionWelcomeNotification() {
   if (delayed_notification_) {
     delayed_notification_.reset();
-    PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this);
+    PrefServiceSyncableFromProfile(profile_)->RemoveObserver(this);
   } else {
     HideWelcomeNotification();
   }
 }
 
 void ExtensionWelcomeNotification::OnIsSyncingChanged() {
   DCHECK(delayed_notification_);
   PrefServiceSyncable* const pref_service_syncable =
-      PrefServiceSyncable::FromProfile(profile_);
+      PrefServiceSyncableFromProfile(profile_);
   if (pref_service_syncable->IsSyncing()) {
     pref_service_syncable->RemoveObserver(this);
     scoped_ptr<Notification> previous_notification(
         delayed_notification_.release());
     ShowWelcomeNotificationIfNecessary(*(previous_notification.get()));
   }
 }
 
 void ExtensionWelcomeNotification::ShowWelcomeNotificationIfNecessary(
     const Notification& notification) {
   if ((notification.notifier_id() == notifier_id_) && !delayed_notification_) {
     PrefServiceSyncable* const pref_service_syncable =
-        PrefServiceSyncable::FromProfile(profile_);
+        PrefServiceSyncableFromProfile(profile_);
     if (pref_service_syncable->IsSyncing()) {
       PrefService* const pref_service = profile_->GetPrefs();
       if (!UserHasDismissedWelcomeNotification()) {
         const PopUpRequest pop_up_request =
             pref_service->GetBoolean(
                 prefs::kWelcomeNotificationPreviouslyPoppedUp)
                 ? POP_UP_HIDDEN
                 : POP_UP_SHOWN;
         if (pop_up_request == POP_UP_SHOWN) {
           pref_service->SetBoolean(
@@ skipping 146 matching lines @@
       prefs::kWelcomeNotificationExpirationTimestamp,
       (delegate_->GetCurrentTime() +
           base::TimeDelta::FromDays(kRequestedShowTimeDays)).ToInternalValue());
 }
 
 bool ExtensionWelcomeNotification::IsWelcomeNotificationExpired() const {
   const base::Time expiration_timestamp = GetExpirationTimestamp();
   return !expiration_timestamp.is_null() &&
          (expiration_timestamp <= delegate_->GetCurrentTime());
 }