Reduced the lifetime of DownloadCreateInfo.

chrome/browser/download/download_browsertest.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 "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/test/test_file_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_file_manager.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/download/download_shelf.h"
-#include "chrome/browser/history/download_create_info.h"
+#include "chrome/browser/history/download_history_info.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/net/url_request_mock_http_job.h"
 #include "chrome/browser/net/url_request_slow_download_job.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/active_downloads_ui.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 662 matching lines @@
         &callback_consumer_,
         NewCallback(this,
                     &DownloadsHistoryDataCollector::OnQueryDownloadsComplete));
 
     // Cannot complete immediately because the history backend runs on a
     // separate thread, so we can assume that the RunMessageLoop below will
     // be exited by the Quit in OnQueryDownloadsComplete.
     ui_test_utils::RunMessageLoop();
   }
 
-  bool GetDownloadsHistoryEntry(DownloadCreateInfo* result) {
+  bool GetDownloadsHistoryEntry(DownloadHistoryInfo* result) {
     DCHECK(result);
     *result = result_;
     return result_valid_;
   }
 
  private:
   void OnQueryDownloadsComplete(
-      std::vector<DownloadCreateInfo>* entries) {
+      std::vector<DownloadHistoryInfo>* entries) {
     result_valid_ = false;
-    for (std::vector<DownloadCreateInfo>::const_iterator it = entries->begin();
+    for (std::vector<DownloadHistoryInfo>::const_iterator it = entries->begin();
          it != entries->end(); ++it) {
       if (it->db_handle == download_db_handle_) {
         result_ = *it;
         result_valid_ = true;
       }
     }
     MessageLoopForUI::current()->Quit();
   }
 
-  DownloadCreateInfo result_;
+  DownloadHistoryInfo result_;
   bool result_valid_;
   int64 download_db_handle_;
   CancelableRequestConsumer callback_consumer_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadsHistoryDataCollector);
 };
 
 // NOTES:
 //
 // Files for these tests are found in DIR_TEST_DATA (currently
@@ skipping 545 matching lines @@
 
   // Check state.
   EXPECT_EQ(1, browser()->tab_count());
   CheckDownload(browser(), file, file);
   EXPECT_TRUE(IsDownloadUIVisible(browser()));
 
   // Check history results.
   DownloadsHistoryDataCollector history_collector(
       db_handle,
       browser()->profile()->GetDownloadManager());
-  DownloadCreateInfo info;
+  DownloadHistoryInfo info;
   EXPECT_TRUE(history_collector.GetDownloadsHistoryEntry(&info)) << db_handle;
   EXPECT_EQ(file, info.path.BaseName());
   EXPECT_EQ(url, info.url());
   // Ignore start_time.
   EXPECT_EQ(origin_size, info.received_bytes);
   EXPECT_EQ(origin_size, info.total_bytes);
   EXPECT_EQ(DownloadItem::COMPLETE, info.state);
 }
 
 // Test for crbug.com/14505. This tests that chrome:// urls are still functional
@@ skipping 44 matching lines @@
   DownloadAndWait(browser(), download_url, EXPECT_NO_SELECT_DIALOG);
 
   ui_test_utils::WindowedNotificationObserver signal(
       NotificationType::BROWSER_CLOSED,
       Source<Browser>(browser()));
   browser()->CloseWindow();
   signal.Wait();
 }
 
 }  // namespace