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

content/browser/download/download_id.cc

Index: content/browser/download/download_id.cc
===================================================================
--- content/browser/download/download_id.cc	(revision 108294)
+++ content/browser/download/download_id.cc	(working copy)
@@ -4,6 +4,14 @@
 
 #include "content/browser/download/download_id.h"
 
+#include <string>
+
+#include "base/stringprintf.h"
+
+std::string DownloadId::DebugString() const {
+  return base::StringPrintf("%p:%d", domain_, local_id_);
+}
+
 std::ostream& operator<<(std::ostream& out, const DownloadId& global_id) {
-  return out << global_id.manager_ << ":" << global_id.local();
+  return out << global_id.DebugString();
 }