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

chrome/browser/extensions/extension_management_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 "base/memory/ref_counted.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/autoupdate_interceptor.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/extension_updater.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
+#include "content/public/browser/notification_service.h"
 
 class ExtensionManagementTest : public ExtensionBrowserTest {
  protected:
   // Helper method that returns whether the extension is at the given version.
   // This calls version(), which must be defined in the extension's bg page,
   // as well as asking the extension itself.
   //
   // Note that 'version' here means something different than the version field
   // in the extension's manifest. We use the version as reported by the
   // background page to test how overinstalling crx files with the same
@@ skipping 195 matching lines @@
 // Used for testing notifications sent during extension updates.
 class NotificationListener : public content::NotificationObserver {
  public:
   NotificationListener() : started_(false), finished_(false) {
     int types[] = {
       chrome::NOTIFICATION_EXTENSION_UPDATING_STARTED,
       chrome::NOTIFICATION_EXTENSION_UPDATING_FINISHED,
       chrome::NOTIFICATION_EXTENSION_UPDATE_FOUND
     };
     for (size_t i = 0; i < arraysize(types); i++) {
-      registrar_.Add(this, types[i], NotificationService::AllSources());
+      registrar_.Add(
+          this, types[i], content::NotificationService::AllSources());
     }
   }
   ~NotificationListener() {}
 
   bool started() { return started_; }
 
   bool finished() { return finished_; }
 
   const std::set<std::string>& updates() { return updates_; }
 
@@ skipping 351 matching lines @@
   }
   ASSERT_TRUE(WaitForExtensionInstall());
   extensions = service->extensions();
   ASSERT_EQ(size_before + 1, extensions->size());
   extension = extensions->at(size_before);
   ASSERT_EQ(kExtensionId, extension->id());
   EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD, extension->location());
   EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId));
   EXPECT_TRUE(service->disabled_extensions()->empty());
 }