Move download interrupt reasons to content\public (the enum that's used by chrome). The rest keep i…

chrome/browser/download/download_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/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
@@ skipping 284 matching lines @@
   // Choice of navigation or direct fetch.  Used by |DownloadFileCheckErrors()|.
   enum DownloadMethod {
     DOWNLOAD_NAVIGATE,
     DOWNLOAD_DIRECT
   };
 
   // Information passed in to |DownloadFileCheckErrors()|.
   struct DownloadInfo {
     const char* url_name;  // URL for the download.
     DownloadMethod download_method;  // Navigation or Direct.
-    InterruptReason reason;  // Download interrupt reason (NONE is OK).
+    // Download interrupt reason (NONE is OK).
+    content::DownloadInterruptReason reason;
     bool show_download_item;  // True if the download item appears on the shelf.
   };
 
   DownloadTest() {
     EnableDOMAutomation();
   }
 
   void SetUpOnMainThread() OVERRIDE {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
@@ skipping 374 matching lines @@
     std::string server_path = "files/downloads/";
     server_path += download_info.url_name;
     GURL url = test_server()->GetURL(server_path);
     ASSERT_TRUE(url.is_valid());
 
     DownloadManager* download_manager = DownloadManagerForBrowser(browser());
     scoped_ptr<DownloadTestObserver> observer(
         new DownloadTestObserver(
             download_manager,
             1,
-            download_info.reason == DOWNLOAD_INTERRUPT_REASON_NONE ?
+            download_info.reason == content::DOWNLOAD_INTERRUPT_REASON_NONE ?
                 DownloadItem::COMPLETE :  // Really done
                 DownloadItem::INTERRUPTED,
             true,                   // Bail on select file
             DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
 
     if (download_info.download_method == DOWNLOAD_DIRECT) {
       // Go directly to download.
       WebContents* web_contents = browser()->GetSelectedWebContents();
       ASSERT_TRUE(web_contents);
       DownloadSaveInfo save_info;
@@ skipping 1290 matching lines @@
   EXPECT_TRUE(waiter_context_menu->select_file_dialog_seen());
   ASSERT_EQ(2u, download_items.size());
   ASSERT_EQ(jpeg_url, download_items[0]->GetOriginalUrl());
   ASSERT_EQ(jpeg_url, download_items[1]->GetOriginalUrl());
 }
 
 IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadNavigate) {
   DownloadInfo download_info = {
     "a_zip_file.zip",
     DOWNLOAD_NAVIGATE,
-    DOWNLOAD_INTERRUPT_REASON_NONE,
+    content::DOWNLOAD_INTERRUPT_REASON_NONE,
     true
   };
 
   // Do initial setup.
   ASSERT_TRUE(InitialSetup(false));
   DownloadFileCheckErrors(download_info);
 }
 
 IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadDirect) {
   DownloadInfo download_info = {
     "a_zip_file.zip",
     DOWNLOAD_DIRECT,
-    DOWNLOAD_INTERRUPT_REASON_NONE,
+    content::DOWNLOAD_INTERRUPT_REASON_NONE,
     true
   };
 
   // Do initial setup.
   ASSERT_TRUE(InitialSetup(false));
   DownloadFileCheckErrors(download_info);
 }
 
 IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadError404Direct) {
   DownloadInfo download_info = {
     "there_IS_no_spoon.zip",
     DOWNLOAD_DIRECT,
-    DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT,
+    content::DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT,
     true
   };
 
   // Do initial setup.
   ASSERT_TRUE(InitialSetup(false));
   DownloadFileCheckErrors(download_info);
 }
 
 IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadError404Navigate) {
   DownloadInfo download_info = {
     "there_IS_no_spoon.zip",
     DOWNLOAD_NAVIGATE,
-    DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT,
+    content::DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT,
     false
   };
 
   // Do initial setup.
   ASSERT_TRUE(InitialSetup(false));
   DownloadFileCheckErrors(download_info);
 }
 
 IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadError400Direct) {
   DownloadInfo download_info = {
     "zip_file_not_found.zip",
     DOWNLOAD_DIRECT,
-    DOWNLOAD_INTERRUPT_REASON_SERVER_FAILED,
+    content::DOWNLOAD_INTERRUPT_REASON_SERVER_FAILED,
     true
   };
 
   // Do initial setup.
   ASSERT_TRUE(InitialSetup(false));
   DownloadFileCheckErrors(download_info);
 }
 
 IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadError400Navigate) {
   DownloadInfo download_info = {
     "zip_file_not_found.zip",
     DOWNLOAD_NAVIGATE,
-    DOWNLOAD_INTERRUPT_REASON_SERVER_FAILED,
+    content::DOWNLOAD_INTERRUPT_REASON_SERVER_FAILED,
     false
   };
 
   // Do initial setup.
   ASSERT_TRUE(InitialSetup(false));
   DownloadFileCheckErrors(download_info);
 }