drive::DownloadHandler should query DownloadHistory.

chrome/browser/chromeos/drive/download_handler.cc

 // Copyright (c) 2012 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/chromeos/drive/download_handler.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/supports_user_data.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/write_on_cache_file.h"
+#include "chrome/browser/download/download_history.h"
+#include "chrome/browser/download/download_service.h"
+#include "chrome/browser/download/download_service_factory.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 using content::DownloadManager;
 using content::DownloadItem;
 
 namespace drive {
 namespace {
 
 // Key for base::SupportsUserData::Data.
@@ skipping 61 matching lines @@
     const content::CheckForFileExistenceCallback& callback,
     FileError error,
     scoped_ptr<ResourceEntry> entry) {
   callback.Run(error == FILE_ERROR_OK);
 }
 
 // Returns true if |download| is a Drive download created from data persisted
 // on the download history DB.
 bool IsPersistedDriveDownload(const base::FilePath& drive_tmp_download_path,
                               DownloadItem* download) {
-  // Persisted downloads are not in IN_PROGRESS state when created, while newly
-  // created downloads are.
-  return drive_tmp_download_path.IsParent(download->GetTargetFilePath()) &&
-      download->GetState() != DownloadItem::IN_PROGRESS;
+  if (!drive_tmp_download_path.IsParent(download->GetTargetFilePath()))
+    return false;
+
+  DownloadService* download_service =
+      DownloadServiceFactory::GetForBrowserContext(
+          download->GetBrowserContext());
+  DownloadHistory* download_history = download_service->GetDownloadHistory();
+
+  return download_history && download_history->WasRestoredFromHistory(download);
 }
 
 }  // namespace
 
 DownloadHandler::DownloadHandler(FileSystemInterface* file_system)
     : file_system_(file_system),
       weak_ptr_factory_(this) {
 }
 
 DownloadHandler::~DownloadHandler() {
@@ skipping 197 matching lines @@
   if (!download)
     return;
   DriveUserData* data = GetDriveUserData(download);
   if (!data)
     return;
   data->set_cache_file_path(*cache_file_path);
 }
 
 
 }  // namespace drive