Move DownloadTestObserver and friends down into content.

chrome/browser/ui/browser_close_browsertest.cc

 // Copyright (c) 2012 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/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
-#include "chrome/browser/download/download_test_observer.h"
+#include "chrome/browser/download/download_test_file_chooser_observer.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.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/public/browser/download_item.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/test/browser_test_utils.h"
+#include "content/public/test/download_test_observer.h"
 #include "content/test/net/url_request_slow_download_job.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DownloadItem;
 using content::DownloadManager;
 
 class BrowserCloseTest : public InProcessBrowserTest {
  public:
   // Structure defining test cases for DownloadsCloseCheck.
@@ skipping 71 matching lines @@
   void CreateStalledDownloads(Browser* browser, int num_downloads) {
     GURL url(URLRequestSlowDownloadJob::kKnownSizeUrl);
 
     if (num_downloads == 0)
       return;
 
     // Setup an observer waiting for the given number of downloads
     // to get to IN_PROGRESS.
     DownloadManager* download_manager =
         BrowserContext::GetDownloadManager(browser->profile());
-    scoped_ptr<DownloadTestObserver> observer(
-        new DownloadTestObserverInProgress(download_manager,
-                                           num_downloads));
+    scoped_ptr<content::DownloadTestObserver> observer(
+        new content::DownloadTestObserverInProgress(download_manager,
+                                                    num_downloads));
 
     // Set of that number of downloads.
     size_t count_downloads = num_downloads;
     while (num_downloads--)
       ui_test_utils::NavigateToURLWithDisposition(
           browser, url, NEW_BACKGROUND_TAB,
           ui_test_utils::BROWSER_TEST_NONE);
 
     // Wait for them.
     observer->WaitForFinished();
@@ skipping 10 matching lines @@
     // Go through and, for every single profile, wait until there are
     // no active downloads on that download manager.
     std::vector<Profile*> profiles(
         g_browser_process->profile_manager()->GetLoadedProfiles());
     for (std::vector<Profile*>::const_iterator pit = profiles.begin();
          pit != profiles.end(); ++pit) {
       DownloadService* download_service =
           DownloadServiceFactory::GetForProfile(*pit);
       if (download_service->HasCreatedDownloadManager()) {
         DownloadManager *mgr = BrowserContext::GetDownloadManager(*pit);
-        scoped_refptr<DownloadTestFlushObserver> observer(
-            new DownloadTestFlushObserver(mgr));
+        scoped_refptr<content::DownloadTestFlushObserver> observer(
+            new content::DownloadTestFlushObserver(mgr));
         observer->WaitForFlush();
       }
       if ((*pit)->HasOffTheRecordProfile()) {
         DownloadService* incognito_download_service =
           DownloadServiceFactory::GetForProfile(
               (*pit)->GetOffTheRecordProfile());
         if (incognito_download_service->HasCreatedDownloadManager()) {
           DownloadManager *mgr = BrowserContext::GetDownloadManager(
               (*pit)->GetOffTheRecordProfile());
-          scoped_refptr<DownloadTestFlushObserver> observer(
-              new DownloadTestFlushObserver(mgr));
+          scoped_refptr<content::DownloadTestFlushObserver> observer(
+              new content::DownloadTestFlushObserver(mgr));
           observer->WaitForFlush();
         }
       }
     }
   }
 
   // Create a Browser (with associated window) on the specified profile.
   Browser* CreateBrowserOnProfile(Profile* profile) {
     Browser* new_browser = new Browser(Browser::CreateParams(profile));
     chrome::AddSelectedTabWithURL(new_browser, GURL(chrome::kAboutBlankURL),
@@ skipping 398 matching lines @@
   }
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, MAYBE_DownloadsCloseCheck_5) {
   ASSERT_TRUE(SetupForDownloadCloseCheck());
   for (size_t i = 5 * arraysize(download_close_check_cases) / 6;
        i < 6 * arraysize(download_close_check_cases) / 6; ++i) {
     ExecuteDownloadCloseCheckCase(i);
   }
 }