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

chrome/browser/printing/print_dialog_cloud_uitest.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/printing/print_dialog_cloud.h"
 #include "chrome/browser/printing/print_dialog_cloud_internal.h"
 
 #include <functional>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.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/browser_thread.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "net/url_request/url_request_filter.h"
 #include "net/url_request/url_request_test_job.h"
 #include "net/url_request/url_request_test_util.h"
 
 namespace {
 
 class TestData {
  public:
   static TestData* GetInstance() {
@@ skipping 203 matching lines @@
   AddTestHandlers();
 
   TestController::GetInstance()->set_use_delegate(true);
 
   ui_test_utils::RunMessageLoop();
 
   ASSERT_TRUE(TestController::GetInstance()->result());
 
   // Close the dialog before finishing the test.
   ui_test_utils::WindowedNotificationObserver signal(
-      content::NOTIFICATION_TAB_CLOSED, NotificationService::AllSources());
+      content::NOTIFICATION_TAB_CLOSED,
+      content::NotificationService::AllSources());
   EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_ESCAPE,
                                               false, false, false, false));
   signal.Wait();
 }
 
 #if defined(OS_CHROMEOS)
 // Disabled until the extern URL is live so that the Print menu item
 // can be enabled for Chromium OS.
 IN_PROC_BROWSER_TEST_F(PrintDialogCloudTest, DISABLED_DialogGrabbed) {
   BrowserList::SetLastActive(browser());
   ASSERT_TRUE(BrowserList::GetLastActive());
 
   AddTestHandlers();
 
   // This goes back one step further for the Chrome OS case, to making
   // sure 'window.print()' gets to the right place.
   ASSERT_TRUE(browser()->GetSelectedTabContents());
   ASSERT_TRUE(browser()->GetSelectedTabContents()->render_view_host());
 
   string16 window_print = ASCIIToUTF16("window.print()");
   browser()->GetSelectedTabContents()->render_view_host()->
       ExecuteJavascriptInWebFrame(string16(), window_print);
 
   ui_test_utils::RunMessageLoop();
 
   ASSERT_TRUE(TestController::GetInstance()->result());
 }
 #endif