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

chrome/browser/automation/automation_tab_helper_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 "base/file_path.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_tab_helper.h"
 #include "chrome/browser/automation/mock_tab_event_observer.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/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "net/base/net_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 
 class MockNotificationObserver : public content::NotificationObserver {
  public:
   MockNotificationObserver() { }
@@ skipping 26 matching lines @@
   }
 
   // Add default expectations for a client redirection initiated by script,
   // and quit the message loop when the redirect has completed. This expects
   // that the tab receives news of the redirect before the script returns.
   void ExpectClientRedirectAndBreak(
       MockTabEventObserver* mock_tab_observer,
       MockNotificationObserver* mock_notification_observer) {
     mock_notification_observer->Register(
         chrome::NOTIFICATION_DOM_OPERATION_RESPONSE,
-        NotificationService::AllSources());
+        content::NotificationService::AllSources());
 
     testing::InSequence expect_in_sequence;
     EXPECT_CALL(*mock_tab_observer, OnFirstPendingLoad(_));
     EXPECT_CALL(*mock_notification_observer, Observe(
         testing::Eq(
             static_cast<int>(chrome::NOTIFICATION_DOM_OPERATION_RESPONSE)),
             _, _));
     EXPECT_CALL(*mock_tab_observer, OnNoMorePendingLoads(_))
         .WillOnce(testing::InvokeWithoutArgs(
             MessageLoopForUI::current(), &MessageLoop::Quit));
@@ skipping 95 matching lines @@
       net::FilePathToFileURL(test_data_dir_.AppendASCII("meta_redirect.html")),
       2);
 }
 
 // Tests that the load stop event occurs after the window onload handler.
 IN_PROC_BROWSER_TEST_F(AutomationTabHelperBrowserTest,
                        LoadStopComesAfterOnLoad) {
   MockNotificationObserver mock_notification_observer;
   mock_notification_observer.Register(
       chrome::NOTIFICATION_DOM_OPERATION_RESPONSE,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
   MockTabEventObserver mock_tab_observer(tab_helper());
 
   EXPECT_CALL(mock_tab_observer, OnFirstPendingLoad(_));
   {
     testing::InSequence expect_in_sequence;
     EXPECT_CALL(mock_notification_observer, Observe(
         testing::Eq(
             static_cast<int>(chrome::NOTIFICATION_DOM_OPERATION_RESPONSE)),
             _, _));
     EXPECT_CALL(mock_tab_observer, OnNoMorePendingLoads(_));
   }
 
   ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(
       test_data_dir_.AppendASCII("sends_message_on_load.html")));
 }
 
 // Tests that a crashed tab reports that it has stopped loading.
 IN_PROC_BROWSER_TEST_F(AutomationTabHelperBrowserTest,
                        CrashedTabStopsLoading) {
   MockTabEventObserver mock_tab_observer(tab_helper());
 
   testing::InSequence expect_in_sequence;
   EXPECT_CALL(mock_tab_observer, OnFirstPendingLoad(_));
   EXPECT_CALL(mock_tab_observer, OnNoMorePendingLoads(_));
 
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUICrashURL));
 }