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

chrome/browser/chromeos/login/screen_locker_browsertest.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 "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
 #include "chrome/browser/chromeos/cros/mock_screen_lock_library.h"
 #include "chrome/browser/chromeos/login/mock_authenticator.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/screen_locker_tester.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/widget/native_widget_gtk.h"
 
 namespace {
 
 // An object that wait for lock state and fullscreen state.
 class Waiter : public content::NotificationObserver {
  public:
   explicit Waiter(Browser* browser)
       : browser_(browser),
         running_(false) {
     registrar_.Add(this,
                    chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
-                   NotificationService::AllSources());
+                   content::NotificationService::AllSources());
     handler_id_ = g_signal_connect(
         G_OBJECT(browser_->window()->GetNativeHandle()),
         "window-state-event",
         G_CALLBACK(OnWindowStateEventThunk),
         this);
   }
 
   ~Waiter() {
     g_signal_handler_disconnect(
         G_OBJECT(browser_->window()->GetNativeHandle()),
@@ skipping 62 matching lines @@
         .RetiresOnSaturation();
     EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenLockCompleted())
         .Times(1)
         .RetiresOnSaturation();
     UserManager::Get()->OffTheRecordUserLoggedIn();
     ScreenLocker::Show();
     scoped_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
     tester->EmulateWindowManagerReady();
     ui_test_utils::WindowedNotificationObserver lock_state_observer(
         chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
-        NotificationService::AllSources());
+        content::NotificationService::AllSources());
     if (!chromeos::ScreenLocker::GetTester()->IsLocked())
       lock_state_observer.Wait();
     EXPECT_TRUE(tester->IsLocked());
     tester->InjectMockAuthenticator("", "");
 
     unlock(tester->GetWidget());
 
     ui_test_utils::RunAllPendingInMessageLoop();
     EXPECT_TRUE(tester->IsLocked());
 
     // Emulate LockScreen request from PowerManager (via SessionManager).
     ScreenLocker::Hide();
     ui_test_utils::RunAllPendingInMessageLoop();
     EXPECT_FALSE(tester->IsLocked());
   }
 
   void LockScreenWithUser(test::ScreenLockerTester* tester,
                           const std::string& user) {
     UserManager::Get()->UserLoggedIn(user);
     ScreenLocker::Show();
     tester->EmulateWindowManagerReady();
     ui_test_utils::WindowedNotificationObserver lock_state_observer(
         chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
-        NotificationService::AllSources());
+        content::NotificationService::AllSources());
     if (!tester->IsLocked())
       lock_state_observer.Wait();
     EXPECT_TRUE(tester->IsLocked());
   }
 
  private:
   virtual void SetUpInProcessBrowserTestFixture() {
     cros_mock_->InitStatusAreaMocks();
     cros_mock_->InitMockScreenLockLibrary();
     mock_screen_lock_library_ = cros_mock_->mock_screen_lock_library();
@@ skipping 25 matching lines @@
       .RetiresOnSaturation();
   EXPECT_CALL(*mock_screen_lock_library_, NotifyScreenLockCompleted())
       .Times(1)
       .RetiresOnSaturation();
   UserManager::Get()->UserLoggedIn("user");
   ScreenLocker::Show();
   scoped_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
   tester->EmulateWindowManagerReady();
   ui_test_utils::WindowedNotificationObserver lock_state_observer(
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
   if (!chromeos::ScreenLocker::GetTester()->IsLocked())
     lock_state_observer.Wait();
 
   // Test to make sure that the widget is actually appearing and is of
   // reasonable size, preventing a regression of
   // http://code.google.com/p/chromium-os/issues/detail?id=5987
   gfx::Rect lock_bounds = tester->GetChildWidget()->GetWindowScreenBounds();
   EXPECT_GT(lock_bounds.width(), 10);
   EXPECT_GT(lock_bounds.height(), 10);
 
@@ skipping 111 matching lines @@
   ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ("", tester->GetPassword());
 
   // Close the locker to match expectations.
   ScreenLocker::Hide();
   ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_FALSE(tester->IsLocked());
 }
 
 }  // namespace chromeos