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

content/browser/download/download_file.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_file.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/stringprintf.h"
@@ skipping 38 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   return download_manager_.get();
 }
 
 std::string DownloadFile::DebugString() const {
   return base::StringPrintf("{"
                             " id_ = " "%d"
                             " request_handle = %s"
                             " Base File = %s"
                             " }",
-                            id_,
+                            id_.local(),
                             request_handle_.DebugString().c_str(),
                             BaseFile::DebugString().c_str());
 }
 
 void DownloadFile::AppendNumberToPath(FilePath* path, int number) {
   *path = path->InsertBeforeExtensionASCII(StringPrintf(" (%d)", number));
 }
 
 int DownloadFile::GetUniquePathNumber(const FilePath& path) {
   if (!file_util::PathExists(path))
@@ skipping 33 matching lines @@
     new_path = FilePath(path);
     AppendNumberToPath(&new_path, count);
 
     if (!file_util::PathExists(new_path) &&
         !file_util::PathExists(AppendSuffixToPath(new_path, suffix)))
       return count;
   }
 
   return -1;
 }