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

chrome/browser/extensions/extension_startup_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 <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/user_script_master.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/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_details.h"
+#include "content/public/browser/notification_service.h"
 #include "net/base/net_util.h"
 
 // This file contains high-level startup tests for the extensions system. We've
 // had many silly bugs where command line flags did not get propagated correctly
 // into the services, so we didn't start correctly.
 
 class ExtensionStartupTestBase : public InProcessBrowserTest {
  public:
   ExtensionStartupTestBase() : enable_extensions_(false) {
     num_expected_extensions_ = 3;
@@ skipping 53 matching lines @@
     for (size_t i = 0; i < service->extensions()->size(); i++)
       if (service->extensions()->at(i)->location() != Extension::COMPONENT)
         found_extensions++;
 
     ASSERT_EQ(static_cast<uint32>(num_expected_extensions),
               static_cast<uint32>(found_extensions));
     ASSERT_EQ(expect_extensions_enabled, service->extensions_enabled());
 
     ui_test_utils::WindowedNotificationObserver user_scripts_observer(
         chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
-        NotificationService::AllSources());
+        content::NotificationService::AllSources());
     UserScriptMaster* master = browser()->profile()->GetUserScriptMaster();
     if (!master->ScriptsReady())
       user_scripts_observer.Wait();
     ASSERT_TRUE(master->ScriptsReady());
   }
 
   void TestInjection(bool expect_css, bool expect_script) {
     // Load a page affected by the content script and test to see the effect.
     FilePath test_file;
     PathService::Get(chrome::DIR_TEST_DATA, &test_file);
@@ skipping 56 matching lines @@
 IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, MAYBE_NoFileAccess) {
   WaitForServicesToStart(num_expected_extensions_, true);
 
   ExtensionService* service = browser()->profile()->GetExtensionService();
   for (size_t i = 0; i < service->extensions()->size(); ++i) {
     if (service->extensions()->at(i)->location() == Extension::COMPONENT)
       continue;
     if (service->AllowFileAccess(service->extensions()->at(i))) {
       ui_test_utils::WindowedNotificationObserver user_scripts_observer(
           chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
-          NotificationService::AllSources());
+          content::NotificationService::AllSources());
       service->SetAllowFileAccess(service->extensions()->at(i), false);
       user_scripts_observer.Wait();
     }
   }
 
   TestInjection(false, false);
 }
 
 // ExtensionsLoadTest
 // Ensures that we can startup the browser with --load-extension and see them
@@ skipping 17 matching lines @@
 #if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
 #define Maybe_Test FLAKY_Test
 #else
 #define Maybe_Test Test
 #endif
 
 IN_PROC_BROWSER_TEST_F(ExtensionsLoadTest, Maybe_Test) {
   WaitForServicesToStart(1, true);
   TestInjection(true, true);
 }