Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

chrome/browser/chromeos/user_cros_settings_provider.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/chromeos/user_cros_settings_provider.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/chromeos/login/ownership_status_checker.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/ui/options/options_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "content/browser/browser_thread.h"
+#include "content/public/browser/notification_service.h"
 
 namespace chromeos {
 
 namespace {
 
 const char kTrueIncantation[] = "true";
 const char kFalseIncantation[] = "false";
 const char kTrustedSuffix[] = "/trusted";
 
 // For all our boolean settings following is applicable:
@@ skipping 19 matching lines @@
 // This class provides the means to migrate settings to the signed settings
 // store. It does one of three things - store the settings in the policy blob
 // immediately if the current user is the owner. Uses the
 // SignedSettingsTempStorage if there is no owner yet, or waits for an
 // OWNERSHIP_CHECKED notification to delay the storing until the owner has
 // logged in.
 class MigrationHelper : public content::NotificationObserver {
  public:
   explicit MigrationHelper() : callback_(NULL) {
     registrar_.Add(this, chrome::NOTIFICATION_OWNERSHIP_CHECKED,
-                   NotificationService::AllSources());
+                   content::NotificationService::AllSources());
   }
 
   void set_callback(SignedSettingsHelper::Callback* callback) {
     callback_ = callback;
   }
 
   void AddMigrationValue(const std::string& path, const std::string& value) {
     migration_values_[path] = value;
   }
 
@@ skipping 663 matching lines @@
   if (cached_whitelist_update->Remove(email_value, NULL))
     prefs->ScheduleSavePersistentPrefs();
 }
 
 // static
 void UserCrosSettingsProvider::UpdateCachedOwner(const std::string& email) {
   UpdateCacheString(kDeviceOwner, email, USE_VALUE_SUPPLIED);
 }
 
 }  // namespace chromeos