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

chrome/browser/automation/automation_provider_observers_chromeos.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/automation/automation_provider_observers.h"
 
 #include "base/values.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/authentication_notification_details.h"
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 using chromeos::CrosLibrary;
 using chromeos::NetworkLibrary;
 
 NetworkManagerInitObserver::NetworkManagerInitObserver(
     AutomationProvider* automation)
     : automation_(automation->AsWeakPtr()) {}
 
 NetworkManagerInitObserver::~NetworkManagerInitObserver() {
     CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
@@ skipping 15 matching lines @@
   if (!obj->wifi_scanning()) {
     automation_->OnNetworkLibraryInit();
     delete this;
   }
 }
 
 LoginWebuiReadyObserver::LoginWebuiReadyObserver(
     AutomationProvider* automation)
     : automation_(automation->AsWeakPtr()) {
   registrar_.Add(this, chrome::NOTIFICATION_LOGIN_WEBUI_READY,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
 }
 
 LoginWebuiReadyObserver::~LoginWebuiReadyObserver() {
 }
 
 void LoginWebuiReadyObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_LOGIN_WEBUI_READY);
@@ skipping 34 matching lines @@
 }
 
 ScreenLockUnlockObserver::ScreenLockUnlockObserver(
     AutomationProvider* automation,
     IPC::Message* reply_message,
     bool lock_screen)
     : automation_(automation->AsWeakPtr()),
       reply_message_(reply_message),
       lock_screen_(lock_screen) {
   registrar_.Add(this, chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
 }
 
 ScreenLockUnlockObserver::~ScreenLockUnlockObserver() {}
 
 void ScreenLockUnlockObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED);
   if (automation_) {
@@ skipping 360 matching lines @@
   user_manager->SaveUserImage(
       user.email(), photo, chromeos::UserManager::User::kExternalImageIndex);
 }
 
 void PhotoCaptureObserver::LocalStateChanged(
     chromeos::UserManager* user_manager) {
   user_manager->RemoveObserver(this);
   AutomationJSONReply(automation_, reply_message_.release()).SendSuccess(NULL);
   delete this;
 }