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

chrome/browser/extensions/browser_action_apitest.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 "build/build_config.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/notification_service.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 class BrowserActionApiTest : public ExtensionApiTest {
  public:
   BrowserActionApiTest() {}
   virtual ~BrowserActionApiTest() {}
 
  protected:
   BrowserActionTestUtil GetBrowserActionsBar() {
     return BrowserActionTestUtil(browser());
   }
 
   bool OpenPopup(int index) {
     ResultCatcher catcher;
     ui_test_utils::WindowedNotificationObserver popup_observer(
         chrome::NOTIFICATION_EXTENSION_POPUP_VIEW_READY,
-        NotificationService::AllSources());
+        content::NotificationService::AllSources());
     GetBrowserActionsBar().Press(index);
     popup_observer.Wait();
     EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
     return GetBrowserActionsBar().HasPopup();
   }
 };
 
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(RunExtensionTest("browser_action/basics")) << message_;
@@ skipping 338 matching lines @@
 
   // There is a background page and a browser action with no badge text.
   ExtensionProcessManager* manager =
       browser()->profile()->GetExtensionProcessManager();
   ASSERT_TRUE(manager->GetBackgroundHostForExtension(extension));
   ExtensionAction* action = extension->browser_action();
   ASSERT_EQ("", action->GetBadgeText(ExtensionAction::kDefaultTabId));
 
   ui_test_utils::WindowedNotificationObserver host_destroyed_observer(
       chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
 
   // Click the browser action.
   browser()->profile()->GetExtensionService()->browser_event_router()->
       BrowserActionExecuted(
           browser()->profile(), action->extension_id(), browser());
 
   // It can take a moment for the background page to actually get destroyed
   // so we wait for the notification before checking that it's really gone
   // and the badge text has been set.
   host_destroyed_observer.Wait();
   ASSERT_FALSE(manager->GetBackgroundHostForExtension(extension));
   ASSERT_EQ("X", action->GetBadgeText(ExtensionAction::kDefaultTabId));
 }