Revert 98656 - Make a new integer field in sql::MetaTable (a per-profile db) containing a counter...

content/browser/download/download_item.cc

Index: content/browser/download/download_item.cc
===================================================================
--- content/browser/download/download_item.cc	(revision 98659)
+++ content/browser/download/download_item.cc	(working copy)
@@ -19,7 +19,6 @@
 #include "content/browser/download/download_file.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file_manager.h"
-#include "content/browser/download/download_id.h"
 #include "content/browser/download/download_manager.h"
 #include "content/browser/download/download_manager_delegate.h"
 #include "content/browser/download/download_persistent_store_info.h"
@@ -191,8 +190,8 @@
                            const FilePath& path,
                            const GURL& url,
                            bool is_otr,
-                           DownloadId download_id)
-    : download_id_(download_id.local()),
+                           int download_id)
+    : download_id_(download_id),
       full_path_(path),
       url_chain_(1, url),
       referrer_url_(GURL()),
@@ -225,10 +224,6 @@
   download_manager_->AssertQueueStateConsistent(this);
 }
 
-DownloadId DownloadItem::global_id() const {
-  return DownloadId(download_manager_, id());
-}
-
 void DownloadItem::AddObserver(Observer* observer) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -580,15 +575,16 @@
   if (NeedsRename()) {
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
         NewRunnableMethod(file_manager,
-            &DownloadFileManager::RenameCompletingDownloadFile, global_id(),
+            &DownloadFileManager::RenameCompletingDownloadFile, id(),
             GetTargetFilePath(), safety_state() == SAFE));
     return;
   }
 
   Completed();
 
-  BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, NewRunnableMethod(
-        file_manager, &DownloadFileManager::CompleteDownload, global_id()));
+  BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
+      NewRunnableMethod(file_manager, &DownloadFileManager::CompleteDownload,
+                        id()));
 }
 
 void DownloadItem::OnDownloadRenamedToFinalName(const FilePath& full_path) {
@@ -714,7 +710,7 @@
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(
-          file_manager, &DownloadFileManager::CancelDownload, global_id()));
+          file_manager, &DownloadFileManager::CancelDownload, download_id_));
 }
 
 void DownloadItem::Init(bool active) {