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

chrome/browser/extensions/convert_web_app_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 <string>
 
 #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_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "content/public/browser/notification_service.h"
 
 class ExtensionFromWebAppTest
     : public InProcessBrowserTest, public content::NotificationObserver {
  protected:
   ExtensionFromWebAppTest() : installed_extension_(NULL) {
   }
 
   std::string expected_extension_id_;
   const Extension* installed_extension_;
 
@@ skipping 18 matching lines @@
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionFromWebAppTest, Basic) {
   ASSERT_TRUE(test_server()->Start());
   browser()->profile()->GetExtensionService()->set_show_extensions_prompts(
       false);
 
   content::NotificationRegistrar registrar;
   registrar.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALLED,
-                NotificationService::AllSources());
+                content::NotificationService::AllSources());
 
   expected_extension_id_ = "fnpgoaochgbdfjndakichfafiocjjpmm";
   ui_test_utils::NavigateToURL(
       browser(),
       test_server()->GetURL(
           "files/extensions/convert_web_app/application.html"));
 
   if (!installed_extension_)
     ui_test_utils::RunMessageLoop();
 
@@ skipping 11 matching lines @@
       ExtensionAPIPermission::kNotification));
 
   ASSERT_EQ(3u, installed_extension_->icons().map().size());
   EXPECT_EQ("icons/16.png", installed_extension_->icons().Get(
       16, ExtensionIconSet::MATCH_EXACTLY));
   EXPECT_EQ("icons/48.png", installed_extension_->icons().Get(
       48, ExtensionIconSet::MATCH_EXACTLY));
   EXPECT_EQ("icons/128.png", installed_extension_->icons().Get(
       128, ExtensionIconSet::MATCH_EXACTLY));
 }