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

chrome/browser/chromeos/login/wizard_in_process_browser_test.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/login/wizard_in_process_browser_test.h"
 
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/notification_service.h"
 
 namespace chromeos {
 
 WizardInProcessBrowserTest::WizardInProcessBrowserTest(const char* screen_name)
     : screen_name_(screen_name),
       controller_(NULL),
       host_(NULL) {
 }
 
 Browser* WizardInProcessBrowserTest::CreateBrowser(Profile* profile) {
   SetUpWizard();
 
   WizardController::SetZeroDelays();
 
   if (!screen_name_.empty()) {
     browser::ShowLoginWizard(screen_name_.c_str(), gfx::Size(1024, 600));
     controller_ = WizardController::default_controller();
     host_ = BaseLoginDisplayHost::default_host();
   }
   return NULL;
 }
 
 void WizardInProcessBrowserTest::CleanUpOnMainThread() {
   ui_test_utils::WindowedNotificationObserver wizard_destroyed_observer(
       chrome::NOTIFICATION_WIZARD_CONTENT_VIEW_DESTROYED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
 
   // LoginDisplayHost owns controllers and all windows.
   MessageLoopForUI::current()->DeleteSoon(FROM_HERE, host_);
 
   // Observers and what not are notified after the views are deleted, which
   // happens after a delay (because they are contained in a NativeWidgetGtk
   // which delays deleting itself). Run the message loop until we know the
   // wizard has been deleted.
   wizard_destroyed_observer.Wait();
 }
 
 }  // namespace chromeos