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

chrome/browser/ui/views/file_manager_dialog_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 "chrome/browser/ui/views/file_manager_dialog.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"  // ASCIIToUTF16
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/shell_dialogs.h"  // SelectFileDialog
 #include "chrome/common/chrome_paths.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"
 #include "content/public/browser/notification_types.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 #include "webkit/fileapi/file_system_path_manager.h"
 
 // Mock listener used by test below.
 class MockSelectFileDialogListener : public SelectFileDialog::Listener {
  public:
   MockSelectFileDialogListener()
     : file_selected_(false),
@@ skipping 101 matching lines @@
   LOG(INFO) << "Waiting for JavaScript ready message.";
   ASSERT_TRUE(init_listener.WaitUntilSatisfied());
 
   // Dialog should be running now.
   ASSERT_TRUE(dialog_->IsRunning(owning_window));
 
   // Inject JavaScript to click the cancel button and wait for notification
   // that the window has closed.
   ui_test_utils::WindowedNotificationObserver host_destroyed(
       content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
   RenderViewHost* host = dialog_->GetRenderViewHost();
   string16 main_frame;
   string16 script = ASCIIToUTF16(
       "console.log(\'Test JavaScript injected.\');"
       "document.querySelector(\'.cancel\').click();");
   // The file selection handler closes the dialog and does not return control
   // to JavaScript, so do not wait for return values.
   host->ExecuteJavascriptInWebFrame(main_frame, script);
   LOG(INFO) << "Waiting for window close notification.";
   host_destroyed.Wait();
@@ skipping 49 matching lines @@
   LOG(INFO) << "Waiting for JavaScript selection-change-complete message.";
   ASSERT_TRUE(selection_listener.WaitUntilSatisfied());
 
   // Dialog should be running now.
   ASSERT_TRUE(dialog_->IsRunning(owning_window));
 
   // Inject JavaScript to click the open button and wait for notification
   // that the window has closed.
   ui_test_utils::WindowedNotificationObserver host_destroyed(
       content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
   RenderViewHost* host = dialog_->GetRenderViewHost();
   string16 main_frame;
   string16 script = ASCIIToUTF16(
       "console.log(\'Test JavaScript injected.\');"
       "document.querySelector('.ok').click();");
   // The file selection handler closes the dialog and does not return control
   // to JavaScript, so do not wait for return values.
   host->ExecuteJavascriptInWebFrame(main_frame, script);
   LOG(INFO) << "Waiting for window close notification.";
   host_destroyed.Wait();
@@ skipping 45 matching lines @@
   LOG(INFO) << "Waiting for JavaScript directory-change-complete message.";
   ASSERT_TRUE(dir_change_listener.WaitUntilSatisfied());
 
   // Dialog should be running now.
   ASSERT_TRUE(dialog_->IsRunning(owning_window));
 
   // Inject JavaScript to click the save button and wait for notification
   // that the window has closed.
   ui_test_utils::WindowedNotificationObserver host_destroyed(
       content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
   RenderViewHost* host = dialog_->GetRenderViewHost();
   string16 main_frame;
   string16 script = ASCIIToUTF16(
       "console.log(\'Test JavaScript injected.\');"
       "document.querySelector('.ok').click();");
   // The file selection handler closes the dialog and does not return control
   // to JavaScript, so do not wait for return values.
   host->ExecuteJavascriptInWebFrame(main_frame, script);
   LOG(INFO) << "Waiting for window close notification.";
   host_destroyed.Wait();
@@ skipping 40 matching lines @@
   browser::NavigateParams p(browser(), GURL("www.google.com"),
                             content::PAGE_TRANSITION_LINK);
   p.window_action = browser::NavigateParams::SHOW_WINDOW;
   p.disposition = SINGLETON_TAB;
   browser::Navigate(&p);
 
   // Inject JavaScript to click the cancel button and wait for notification
   // that the window has closed.
   ui_test_utils::WindowedNotificationObserver host_destroyed(
       content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
   RenderViewHost* host = dialog_->GetRenderViewHost();
   string16 main_frame;
   string16 script = ASCIIToUTF16(
       "console.log(\'Test JavaScript injected.\');"
       "document.querySelector(\'.cancel\').click();");
   // The file selection handler closes the dialog and does not return control
   // to JavaScript, so do not wait for return values.
   host->ExecuteJavascriptInWebFrame(main_frame, script);
   LOG(INFO) << "Waiting for window close notification.";
   host_destroyed.Wait();
 
   // Dialog no longer believes it is running.
   ASSERT_FALSE(dialog_->IsRunning(owning_window));
 
   // Listener should have been informed of the cancellation.
   ASSERT_FALSE(listener_->file_selected());
   ASSERT_TRUE(listener_->canceled());
   ASSERT_EQ(this, listener_->params());
 }