Merge 8401001 r107836 into branch 912: Fix history importing by delaying DownloadManager creation.

content/browser/download/download_manager.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 "content/browser/download/download_manager.h"
 
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "base/synchronization/lock.h"
 #include "base/sys_string_conversions.h"
 #include "base/task.h"
 #include "build/build_config.h"
 #include "content/browser/browser_context.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/content_browser_client.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file_manager.h"
+#include "content/browser/download/download_id_factory.h"
 #include "content/browser/download/download_item.h"
 #include "content/browser/download/download_manager_delegate.h"
 #include "content/browser/download/download_persistent_store_info.h"
 #include "content/browser/download/download_stats.h"
 #include "content/browser/download/download_status_updater.h"
 #include "content/browser/download/interrupt_reasons.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ skipping 18 matching lines @@
       true,
       DownloadResourceHandler::OnStartedCallback(),
       render_process_id,
       render_view_id,
       *context);
 }
 
 }  // namespace
 
 DownloadManager::DownloadManager(DownloadManagerDelegate* delegate,
+                                 DownloadIdFactory* id_factory,
                                  DownloadStatusUpdater* status_updater)
     : shutdown_needed_(false),
       browser_context_(NULL),
-      next_id_(0),
       file_manager_(NULL),
       status_updater_((status_updater != NULL)
                       ? status_updater->AsWeakPtr()
                       : base::WeakPtr<DownloadStatusUpdater>()),
       delegate_(delegate),
+      id_factory_(id_factory),
       largest_db_handle_in_history_(DownloadItem::kUninitializedHandle) {
   // NOTE(benjhayden): status_updater may be NULL when using
   // TestingBrowserProcess.
   if (status_updater_.get() != NULL)
     status_updater_->AddDelegate(this);
 }
 
 DownloadManager::~DownloadManager() {
   DCHECK(!shutdown_needed_);
   if (status_updater_.get() != NULL)
     status_updater_->RemoveDelegate(this);
 }
 
+DownloadId DownloadManager::GetNextId() {
+  return id_factory_->GetNextId();
+}
+
 void DownloadManager::Shutdown() {
   VLOG(20) << __FUNCTION__ << "()"
            << " shutdown_needed_ = " << shutdown_needed_;
   if (!shutdown_needed_)
     return;
   shutdown_needed_ = false;
 
   FOR_EACH_OBSERVER(Observer, observers_, ManagerGoingDown());
   // TODO(benjhayden): Consider clearing observers_.
 
@@ skipping 94 matching lines @@
     // The Incognito Downloads page will get the list of non-Incognito downloads
     // from its parent profile.
     if (browser_context_->IsOffTheRecord() != download_item->is_otr())
       continue;
 
     if (download_item->MatchesQuery(query_lower))
       result->push_back(download_item);
   }
 }
 
-void DownloadManager::OnPersistentStoreGetNextId(int next_id) {
-  DVLOG(1) << __FUNCTION__ << " " << next_id;
-  base::AutoLock lock(next_id_lock_);
-  // TODO(benjhayden) Delay Profile initialization until here, and set next_id_
-  // = next_id. The '+=' works for now because these ids are not yet persisted
-  // to the database. GetNextId() can allocate zero or more ids starting from 0,
-  // then this callback can increment next_id_, and the items with lower ids
-  // won't clash with any other items even though there may be items loaded from
-  // the history because items from the history don't have valid ids.
-  next_id_ += next_id;
-}
-
-DownloadId DownloadManager::GetNextId() {
-  // May be called on any thread via the GetNextIdThunk.
-  // TODO(benjhayden) If otr, forward to parent DM.
-  base::AutoLock lock(next_id_lock_);
-  return DownloadId(this, next_id_++);
-}
-
-DownloadManager::GetNextIdThunkType DownloadManager::GetNextIdThunk() {
-  // TODO(benjhayden) If otr, forward to parent DM.
-  return base::Bind(&DownloadManager::GetNextId, this);
-}
-
 // Query the history service for information about all persisted downloads.
 bool DownloadManager::Init(content::BrowserContext* browser_context) {
   DCHECK(browser_context);
   DCHECK(!shutdown_needed_)  << "DownloadManager already initialized.";
   shutdown_needed_ = true;
 
   browser_context_ = browser_context;
 
   // In test mode, there may be no ResourceDispatcherHost.  In this case it's
   // safe to avoid setting |file_manager_| because we only call a small set of
@@ skipping 90 matching lines @@
     // No prompting for download, just continue with the suggested name.
     ContinueDownloadWithPath(download, suggested_path);
   }
 }
 
 void DownloadManager::CreateDownloadItem(DownloadCreateInfo* info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DownloadItem* download = new DownloadItem(this, *info,
                                             browser_context_->IsOffTheRecord());
-  int32 download_id = info->download_id;
+  int32 download_id = info->download_id.local();
   DCHECK(!ContainsKey(in_progress_, download_id));
 
   // TODO(rdsmith): Remove after http://crbug.com/85408 resolved.
   CHECK(!ContainsKey(active_downloads_, download_id));
   downloads_.insert(download);
   active_downloads_[download_id] = download;
 }
 
 void DownloadManager::ContinueDownloadWithPath(DownloadItem* download,
                                                const FilePath& chosen_file) {
@@ skipping 739 matching lines @@
 void DownloadManager::MarkDownloadOpened(DownloadItem* download) {
   delegate_->UpdateItemInPersistentStore(download);
   int num_unopened = 0;
   for (DownloadMap::iterator it = history_downloads_.begin();
        it != history_downloads_.end(); ++it) {
     if (it->second->IsComplete() && !it->second->opened())
       ++num_unopened;
   }
   download_stats::RecordOpensOutstanding(num_unopened);
 }