Download code cleanup patch of death:

chrome/browser/download/download_item.cc

 // Copyright (c) 2010 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 "chrome/browser/download/download_item.h"
 
 #include "base/logging.h"
 #include "base/timer.h"
+#include "chrome/browser/download/download_history.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/history/download_types.h"
 #include "chrome/common/extensions/extension.h"
 
 namespace {
 
 // Update frequency (milliseconds).
 const int kUpdateTimeMs = 1000;
 
@@ skipping 42 matching lines @@
       path_uniquifier_(info.path_uniquifier),
       url_(info.url),
       referrer_url_(info.referrer_url),
       mime_type_(info.mime_type),
       original_mime_type_(info.original_mime_type),
       total_bytes_(info.total_bytes),
       received_bytes_(0),
       start_tick_(base::TimeTicks::Now()),
       state_(IN_PROGRESS),
       start_time_(info.start_time),
-      db_handle_(DownloadManager::kUninitializedHandle),
+      db_handle_(DownloadHistory::kUninitializedHandle),
       download_manager_(download_manager),
       is_paused_(false),
       open_when_complete_(false),
       safety_state_(info.is_dangerous ? DANGEROUS : SAFE),
       auto_opened_(false),
       original_name_(info.original_name),
       render_process_id_(info.child_id),
       request_id_(info.request_id),
       save_as_(info.prompt_user_for_save_location),
       is_otr_(is_otr),
@@ skipping 14 matching lines @@
       path_uniquifier_(0),
       url_(url),
       referrer_url_(GURL()),
       mime_type_(std::string()),
       original_mime_type_(std::string()),
       total_bytes_(0),
       received_bytes_(0),
       start_tick_(base::TimeTicks::Now()),
       state_(IN_PROGRESS),
       start_time_(base::Time::Now()),
-      db_handle_(DownloadManager::kUninitializedHandle),
+      db_handle_(DownloadHistory::kUninitializedHandle),
       download_manager_(download_manager),
       is_paused_(false),
       open_when_complete_(false),
       safety_state_(SAFE),
       auto_opened_(false),
       original_name_(FilePath()),
       render_process_id_(-1),
       request_id_(-1),
       save_as_(false),
       is_otr_(is_otr),
@@ skipping 176 matching lines @@
     return name;
   }
   return original_name_;
 }
 
 void DownloadItem::Init(bool start_timer) {
   file_name_ = full_path_.BaseName();
   if (start_timer)
     StartProgressTimer();
 }