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

chrome/browser/component_updater/component_updater_service_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 "chrome/browser/component_updater/component_updater_service.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "chrome/browser/component_updater/component_updater_interceptor.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/test_url_request_context_getter.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/net/url_fetcher.h"
 #include "content/public/browser/notification_observer.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/test/test_notification_tracker.h"
 
 #include "googleurl/src/gurl.h"
 #include "libxml/globals.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 // Overrides some of the component updater behaviors so it is easier to test
 // and loops faster. In actual usage it takes hours do to a full cycle.
@@ skipping 114 matching lines @@
 
     // Subscribe to all component updater notifications.
     const int notifications[] = {
       chrome::NOTIFICATION_COMPONENT_UPDATER_STARTED,
       chrome::NOTIFICATION_COMPONENT_UPDATER_SLEEPING,
       chrome::NOTIFICATION_COMPONENT_UPDATE_FOUND,
       chrome::NOTIFICATION_COMPONENT_UPDATE_READY
     };
 
     for (int ix = 0; ix != arraysize(notifications); ++ix) {
-      notification_tracker_.ListenFor(notifications[ix],
-                                      NotificationService::AllSources());
+      notification_tracker_.ListenFor(
+          notifications[ix], content::NotificationService::AllSources());
     }
     URLFetcher::enable_interception_for_tests(true);
   }
 
   ~ComponentUpdaterTest() {
     URLFetcher::enable_interception_for_tests(false);
   }
 
   ComponentUpdateService* component_updater() {
     return component_updater_.get();
@@ skipping 236 matching lines @@
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
   message_loop.Run();
 
   EXPECT_EQ(1, interceptor->hit_count());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->install_count());
 
   component_updater()->Stop();
 }