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

chrome/browser/download/save_page_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/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_history.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/active_downloads_ui.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/download/download_item.h"
 #include "content/browser/download/download_manager.h"
 #include "content/browser/download/download_persistent_store_info.h"
 #include "content/browser/net/url_request_mock_http_job.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("save_page");
 
 static const char* kAppendedExtension =
 #if defined(OS_WIN)
     ".htm";
@@ skipping 34 matching lines @@
     TabContents* current_tab = browser()->GetSelectedTabContents();
     EXPECT_TRUE(current_tab);
     return current_tab;
   }
 
 
   GURL WaitForSavePackageToFinish() const {
     ui_test_utils::TestNotificationObserver observer;
     ui_test_utils::RegisterAndWait(&observer,
         content::NOTIFICATION_SAVE_PACKAGE_SUCCESSFULLY_FINISHED,
-        NotificationService::AllSources());
+        content::NotificationService::AllSources());
     return content::Details<DownloadItem>(observer.details()).ptr()->
         original_url();
   }
 
 #if defined(OS_CHROMEOS) && defined(TOUCH_UI)
   const ActiveDownloadsUI::DownloadList& GetDownloads() const {
     TabContents* download_contents = ActiveDownloadsUI::GetPopup(NULL);
     ActiveDownloadsUI* downloads_ui = static_cast<ActiveDownloadsUI*>(
         download_contents->web_ui());
     EXPECT_TRUE(downloads_ui);
@@ skipping 254 matching lines @@
 IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, ExplicitCancel) {
   GURL url = NavigateToMockURL("a");
   FilePath full_file_name, dir;
   GetDestinationPaths("a", &full_file_name, &dir);
   scoped_refptr<SavePackage> save_package(new SavePackage(GetCurrentTab(),
       SavePackage::SAVE_AS_ONLY_HTML, full_file_name, dir));
   save_package->Cancel(true);
 }
 
 }  // namespace