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

chrome/browser/debugger/devtools_sanity_unittest.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/ref_counted.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/debugger/devtools_client_host.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/debugger/worker_devtools_manager.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/worker_host/worker_process_host.h"
 #include "content/browser/worker_host/worker_service.h"
 #include "content/browser/worker_host/worker_service_observer.h"
 #include "content/common/worker_messages.h"
-#include "content/common/notification_service.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_registrar.h"
+#include "content/public/browser/notification_service.h"
 #include "net/test/test_server.h"
 
 namespace {
 
 // Used to block until a dev tools client window's browser is closed.
 class BrowserClosedObserver : public content::NotificationObserver {
  public:
   explicit BrowserClosedObserver(Browser* browser) {
     registrar_.Add(this, chrome::NOTIFICATION_BROWSER_CLOSED,
                    content::Source<Browser>(browser));
@@ skipping 75 matching lines @@
     RunTestFuntion(window_, test_name.c_str());
     CloseDevToolsWindow();
   }
 
   void OpenDevToolsWindow(const std::string& test_page) {
     ASSERT_TRUE(test_server()->Start());
     GURL url = test_server()->GetURL(test_page);
     ui_test_utils::NavigateToURL(browser(), url);
 
     ui_test_utils::WindowedNotificationObserver observer(
-        content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources());
+        content::NOTIFICATION_LOAD_STOP,
+        content::NotificationService::AllSources());
     inspected_rvh_ = GetInspectedTab()->render_view_host();
     window_ = DevToolsWindow::OpenDevToolsWindow(inspected_rvh_);
     observer.Wait();
   }
 
   TabContents* GetInspectedTab() {
     return browser()->GetTabContentsAt(0);
   }
 
   void CloseDevToolsWindow() {
@@ skipping 57 matching lines @@
     ASSERT_TRUE(LoadExtensionFromPath(path)) << "Failed to load extension.";
   }
 
  private:
   bool LoadExtensionFromPath(const FilePath& path) {
     ExtensionService* service = browser()->profile()->GetExtensionService();
     size_t num_before = service->extensions()->size();
     {
       content::NotificationRegistrar registrar;
       registrar.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
-                    NotificationService::AllSources());
+                    content::NotificationService::AllSources());
       CancelableQuitTask* delayed_quit =
           new CancelableQuitTask("Extension load timed out.");
       MessageLoop::current()->PostDelayedTask(FROM_HERE, delayed_quit,
           4*1000);
       service->LoadExtension(path);
       ui_test_utils::RunMessageLoop();
       delayed_quit->cancel();
     }
     size_t num_after = service->extensions()->size();
     if (num_after != (num_before + 1))
       return false;
 
     return WaitForExtensionHostsToLoad();
   }
 
   bool WaitForExtensionHostsToLoad() {
     // Wait for all the extension hosts that exist to finish loading.
     // NOTE: This assumes that the extension host list is not changing while
     // this method is running.
 
     content::NotificationRegistrar registrar;
     registrar.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
-                  NotificationService::AllSources());
+                  content::NotificationService::AllSources());
     CancelableQuitTask* delayed_quit =
         new CancelableQuitTask("Extension host load timed out.");
     MessageLoop::current()->PostDelayedTask(FROM_HERE, delayed_quit,
         4*1000);
 
     ExtensionProcessManager* manager =
           browser()->profile()->GetExtensionProcessManager();
     for (ExtensionProcessManager::const_iterator iter = manager->begin();
          iter != manager->end();) {
       if ((*iter)->did_stop_loading())
@@ skipping 302 matching lines @@
 
     // Reload page to restart the worker.
     ui_test_utils::NavigateToURL(browser(), url);
 
     // Wait until worker script is paused on the debugger statement.
     RunTestFuntion(window_, "testPauseInSharedWorkerInitialization");
     CloseDevToolsWindow();
 }
 
 }  // namespace