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

chrome/browser/ui/panels/base_panel_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/ui/panels/base_panel_browser_test.h"
 
 #include "chrome/browser/ui/browser_list.h"
 
 #include "base/command_line.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/message_loop.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/common/url_constants.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #endif
 
 namespace {
 
 const int kTestingWorkAreaWidth = 800;
 const int kTestingWorkAreaHeight = 600;
@@ skipping 208 matching lines @@
                                                  browser()->profile());
   EXPECT_TRUE(panel_browser->is_type_panel());
 
   if (params.url.is_empty()) {
     TabContentsWrapper* tab_contents =
         new TabContentsWrapper(new TestTabContents(browser()->profile(), NULL));
     panel_browser->AddTab(tab_contents, content::PAGE_TRANSITION_LINK);
   } else {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
-        NotificationService::AllSources());
+        content::NotificationService::AllSources());
     panel_browser->AddSelectedTabWithURL(params.url,
                                          content::PAGE_TRANSITION_START_PAGE);
     observer.Wait();
   }
 
   Panel* panel = static_cast<Panel*>(panel_browser->window());
 
   if (params.show_flag == SHOW_AS_ACTIVE) {
     panel->Show();
   } else {
@@ skipping 64 matching lines @@
   std::string error;
   scoped_refptr<Extension> extension = Extension::Create(
       full_path,  location, *input_value,
       Extension::STRICT_ERROR_CHECKS, &error);
   EXPECT_TRUE(extension.get());
   EXPECT_STREQ("", error.c_str());
   browser()->GetProfile()->GetExtensionService()->OnLoadSingleExtension(
       extension.get(), false);
   return extension;
 }