Persist download interrupt reason, both target and current paths, and url_chain.

chrome/browser/download/save_page_browsertest.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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 130 matching lines @@
 bool DownloadStoredProperly(
     const GURL& expected_url,
     const FilePath& expected_path,
     int64 num_files,
     DownloadItem::DownloadState expected_state,
     DownloadItem* item,
     const history::DownloadRow& info) {
   // This function may be called multiple times for a given test. Returning
   // false doesn't necessarily mean that the test has failed or will fail, it
   // might just mean that the test hasn't passed yet.
-  if (info.path != expected_path) {
-    VLOG(20) << __FUNCTION__ << " " << info.path.value()
+  if (info.target_path != expected_path) {
+    VLOG(20) << __FUNCTION__ << " " << info.target_path.value()
              << " != " << expected_path.value();
     return false;
   }
-  if (info.url != expected_url) {
-    VLOG(20) << __FUNCTION__ << " " << info.url.spec()
+  if (info.url_chain.size() != 1u) {
+    VLOG(20) << __FUNCTION__ << " " << info.url_chain.size()
+             << " != 1";
+    return false;
+  }
+  if (info.url_chain[0] != expected_url) {
+    VLOG(20) << __FUNCTION__ << " " << info.url_chain[0].spec()
              << " != " << expected_url.spec();
     return false;
   }
   if ((num_files >= 0) && (info.received_bytes != num_files)) {
     VLOG(20) << __FUNCTION__ << " " << num_files
              << " != " << info.received_bytes;
     return false;
   }
   if (info.state != expected_state) {
     VLOG(20) << __FUNCTION__ << " " << info.state
@@ skipping 522 matching lines @@
       DownloadItem::COMPLETE));
   chrome::SavePage(browser());
   ASSERT_TRUE(WaitForSavePackageToFinish(browser(), url));
   persisted.WaitForPersisted();
 
   EXPECT_TRUE(file_util::PathExists(full_file_name));
   int64 actual_file_size = -1;
   EXPECT_TRUE(file_util::GetFileSize(full_file_name, &actual_file_size));
   EXPECT_LE(kFileSizeMin, actual_file_size);
 }