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

content/browser/download/download_file_manager.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 "content/browser/download/download_file_manager.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/download/base_file.h"
 #include "content/browser/download/download_buffer.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file_impl.h"
+#include "content/browser/download/download_interrupt_reasons_impl.h"
 #include "content/browser/download/download_request_handle.h"
 #include "content/browser/download/download_stats.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/download_manager_delegate.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/io_buffer.h"
 
@@ skipping 79 matching lines @@
     // Error:  Handle via download manager/item.
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(
             &DownloadManager::OnDownloadInterrupted,
             download_manager,
             info->download_id.local(),
             0,
             "",
-            ConvertNetErrorToInterruptReason(init_result,
-                                             DOWNLOAD_INTERRUPT_FROM_DISK)));
+            content::ConvertNetErrorToInterruptReason(
+                init_result, content::DOWNLOAD_INTERRUPT_FROM_DISK)));
   } else {
     DCHECK(GetDownloadFile(info->download_id) == NULL);
     downloads_[info->download_id] = download_file.release();
 
     // The file is now ready, we can un-pause the request and start saving data.
     request_handle.ResumeRequest();
 
     StartUpdateTimer();
   }
 
@@ skipping 102 matching lines @@
         download_file = NULL;  // Was deleted in |CancelDownload|.
 
         if (download_manager) {
           BrowserThread::PostTask(
               BrowserThread::UI, FROM_HERE,
               base::Bind(&DownloadManager::OnDownloadInterrupted,
                          download_manager,
                          global_id.local(),
                          bytes_downloaded,
                          hash_state,
-                         ConvertNetErrorToInterruptReason(
+                         content::ConvertNetErrorToInterruptReason(
                              write_result,
-                             DOWNLOAD_INTERRUPT_FROM_DISK)));
+                             content::DOWNLOAD_INTERRUPT_FROM_DISK)));
         }
       }
     }
     data->Release();
   }
 }
 
 void DownloadFileManager::OnResponseCompleted(
     DownloadId global_id,
-    InterruptReason reason,
+    content::DownloadInterruptReason reason,
     const std::string& security_info) {
   VLOG(20) << __FUNCTION__ << "()" << " id = " << global_id
            << " reason = " << InterruptReasonDebugString(reason)
            << " security_info = \"" << security_info << "\"";
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DownloadFile* download_file = GetDownloadFile(global_id);
   if (!download_file)
     return;
 
   download_file->Finish();
 
   DownloadManager* download_manager = download_file->GetDownloadManager();
   if (!download_manager) {
     CancelDownload(global_id);
     return;
   }
 
-  if (reason == DOWNLOAD_INTERRUPT_REASON_NONE) {
+  if (reason == content::DOWNLOAD_INTERRUPT_REASON_NONE) {
     std::string hash;
     if (!download_file->GetHash(&hash) ||
         BaseFile::IsEmptyHash(hash)) {
       hash.clear();
     }
 
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&DownloadManager::OnResponseCompleted,
                    download_manager, global_id.local(),
@@ skipping 182 matching lines @@
     return;
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&DownloadManager::OnDownloadInterrupted,
                  download_manager,
                  global_id.local(),
                  download_file->BytesSoFar(),
                  download_file->GetHashState(),
-                 ConvertNetErrorToInterruptReason(
+                 content::ConvertNetErrorToInterruptReason(
                      rename_error,
-                     DOWNLOAD_INTERRUPT_FROM_DISK)));
+                     content::DOWNLOAD_INTERRUPT_FROM_DISK)));
 }
 
 void DownloadFileManager::EraseDownload(DownloadId global_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   if (!ContainsKey(downloads_, global_id))
     return;
 
   DownloadFile* download_file = downloads_[global_id];
 
   VLOG(20) << " " << __FUNCTION__ << "()"
            << " id = " << global_id
            << " download_file = " << download_file->DebugString();
 
   downloads_.erase(global_id);
 
   delete download_file;
 
   if (downloads_.empty())
     StopUpdateTimer();
 }