Expose final download URL (actual url after redirects) in the extension API.

chrome/browser/extensions/api/downloads/downloads_api_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.
 
 // Disable everything on windows only. http://crbug.com/306144
 #ifndef OS_WIN
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 33 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_features.h"
 #include "content/public/test/download_test_observer.h"
 #include "content/public/test/test_download_request_handler.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/notification_types.h"
 #include "net/base/data_url.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
+#include "net/test/embedded_test_server/http_request.h"
+#include "net/test/embedded_test_server/http_response.h"
 #include "net/test/url_request/url_request_slow_download_job.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #include "storage/browser/fileapi/file_system_operation_runner.h"
 #include "storage/browser/fileapi/file_system_url.h"
 #include "ui/base/page_transition_types.h"
@@ skipping 730 matching lines @@
 #define INTERRUPT_REASON(name, value)             \
   case content::DOWNLOAD_INTERRUPT_REASON_##name: \
     return downloads::INTERRUPT_REASON_##name;
 #include "content/public/browser/download_interrupt_reason_values.h"
 #undef INTERRUPT_REASON
   }
   NOTREACHED();
   return downloads::INTERRUPT_REASON_NONE;
 }
 
+std::unique_ptr<net::test_server::HttpResponse> RedirectRequestHandler(

[asanka, 2016/06/22 19:05:14]

There's a canned redirect handler that you can use with the default
EmbeddedTestServer in browser_tests.

See
https://cs.chromium.org/chromium/src/net/test/embedded_test_server/default_ha...

[mharanczyk, 2016/06/23 10:33:21]

Done.

+    const std::string& relative_url,
+    const GURL& target_url,
+    const net::test_server::HttpRequest& request) {
+  std::unique_ptr<net::test_server::BasicHttpResponse> response;
+  if (request.relative_url == relative_url) {
+    response.reset(new net::test_server::BasicHttpResponse);
+    response->set_code(net::HTTP_FOUND);
+    response->AddCustomHeader("Location", target_url.spec());
+  }
+  return std::move(response);
+}
+
 }  // namespace
 
 #if defined(OS_CHROMEOS)
 // http://crbug.com/396510
 #define MAYBE_DownloadExtensionTest_Open DISABLED_DownloadExtensionTest_Open
 #else
 #define MAYBE_DownloadExtensionTest_Open DownloadExtensionTest_Open
 #endif
 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
                        MAYBE_DownloadExtensionTest_Open) {
   LoadExtension("downloads_split");
   DownloadsOpenFunction* open_function = new DownloadsOpenFunction();
   open_function->set_user_gesture(true);
   EXPECT_STREQ(errors::kInvalidId,
                RunFunctionAndReturnError(
                    open_function,
                    "[-42]").c_str());
 
   DownloadItem* download_item = CreateSlowTestDownload();
   ASSERT_TRUE(download_item);
   EXPECT_FALSE(download_item->GetOpened());
   EXPECT_FALSE(download_item->GetOpenWhenComplete());
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"mime\": \"application/octet-stream\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
+                          download_item->GetURL().spec().c_str(),
                           download_item->GetURL().spec().c_str())));
   open_function = new DownloadsOpenFunction();
   open_function->set_user_gesture(true);
   EXPECT_STREQ(errors::kNotComplete,
                RunFunctionAndReturnError(
                    open_function,
                    DownloadItemIdAsArgList(download_item)).c_str());
 
   FinishPendingSlowDownloads();
   EXPECT_FALSE(download_item->GetOpened());
@@ skipping 668 matching lines @@
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
   ASSERT_EQ(GetExtensionURL(), item->GetSiteUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(
       WaitFor(downloads::OnChanged::kEventName,
               base::StringPrintf("[{\"id\": %d,"
                                  "  \"filename\": {"
                                  "    \"previous\": \"\","
                                  "    \"current\": \"%s\"}}]",
                                  result_id, GetFilename("slow.txt").c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"state\": {"
                           "    \"previous\": \"in_progress\","
                           "    \"current\": \"complete\"}}]",
                           result_id)));
 }
 
+// Test that we can start a download that gets redirected and that the correct
+// sequence of events is fired for it.
+IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
+                       DownloadExtensionTest_Download_Redirect) {
+  LoadExtension("downloads_split");
+  ASSERT_TRUE(StartEmbeddedTestServer());
+  const char redirect_path[] = "/slow_redirect";
+  GURL download_url = embedded_test_server()->GetURL(redirect_path);
+  GURL download_final_url = embedded_test_server()->GetURL("/slow?0");
+  embedded_test_server()->RegisterRequestHandler(
+      base::Bind(&RedirectRequestHandler, redirect_path, download_final_url));
+
+  GoOnTheRecord();
+
+  // Start downloading a file.
+  std::unique_ptr<base::Value> result(RunFunctionAndReturnResult(
+      new DownloadsDownloadFunction(),
+      base::StringPrintf("[{\"url\": \"%s\"}]", download_url.spec().c_str())));
+  ASSERT_TRUE(result.get());
+  int result_id = -1;
+  ASSERT_TRUE(result->GetAsInteger(&result_id));
+  DownloadItem* item = GetCurrentManager()->GetDownload(result_id);
+  ASSERT_TRUE(item);
+  ScopedCancellingItem canceller(item);
+  ASSERT_EQ(download_url, item->GetOriginalUrl());
+  ASSERT_EQ(GetExtensionURL(), item->GetSiteUrl().spec());
+
+  ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
+                      base::StringPrintf(
+                          "[{\"danger\": \"safe\","
+                          "  \"incognito\": false,"
+                          "  \"mime\": \"text/plain\","
+                          "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
+                          "  \"url\": \"%s\"}]",
+                          download_final_url.spec().c_str(),
+                          download_url.spec().c_str())));
+  ASSERT_TRUE(
+      WaitFor(downloads::OnChanged::kEventName,
+              base::StringPrintf("[{\"id\": %d,"
+                                 "  \"filename\": {"
+                                 "    \"previous\": \"\","
+                                 "    \"current\": \"%s\"}}]",
+                                 result_id, GetFilename("slow.txt").c_str())));
+  ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
+                      base::StringPrintf(
+                          "[{\"id\": %d,"
+                          "  \"state\": {"
+                          "    \"previous\": \"in_progress\","
+                          "    \"current\": \"complete\"}}]",
+                          result_id)));
+}
+
 // Test that we can start a download from an incognito context, and that the
 // download knows that it's incognito.
 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
                        DownloadExtensionTest_Download_Incognito) {
   LoadExtension("downloads_split");
   ASSERT_TRUE(StartEmbeddedTestServer());
   GoOffTheRecord();
   std::string download_url = embedded_test_server()->GetURL("/slow?0").spec();
 
   // Start downloading a file.
   std::unique_ptr<base::Value> result(RunFunctionAndReturnResult(
       new DownloadsDownloadFunction(),
       base::StringPrintf("[{\"url\": \"%s\"}]", download_url.c_str())));
   ASSERT_TRUE(result.get());
   int result_id = -1;
   ASSERT_TRUE(result->GetAsInteger(&result_id));
   DownloadItem* item = GetCurrentManager()->GetDownload(result_id);
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": true,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(
       WaitFor(downloads::OnChanged::kEventName,
               base::StringPrintf("[{\"id\":%d,"
                                  "  \"filename\": {"
                                  "    \"previous\": \"\","
                                  "    \"current\": \"%s\"}}]",
                                  result_id, GetFilename("slow.txt").c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
                       base::StringPrintf(
@@ skipping 163 matching lines @@
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\": {"
                           "    \"previous\": \"\","
                           "    \"current\": \"%s\"}}]",
                           result_id,
                           GetFilename("sub/dir/ect/ory.txt").c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
@@ skipping 114 matching lines @@
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(
       WaitFor(downloads::OnChanged::kEventName,
               base::StringPrintf("[{\"id\": %d,"
                                  "  \"filename\": {"
                                  "    \"previous\": \"\","
                                  "    \"current\": \"%s\"}}]",
                                  result_id, GetFilename("slow.txt").c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
                       base::StringPrintf(
@@ skipping 22 matching lines @@
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\": {"
                           "    \"previous\": \"\","
                           "    \"current\": \"%s\"}}]",
                           result_id,
                           GetFilename(kFilename).c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
@@ skipping 15 matching lines @@
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller2(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\": {"
                           "    \"previous\": \"\","
                           "    \"current\": \"%s\"}}]",
                           result_id,
                           GetFilename(kFilename).c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
@@ skipping 24 matching lines @@
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\": {"
                           "    \"previous\": \"\","
                           "    \"current\": \"%s\"}}]",
                           result_id,
                           GetFilename("data.txt").c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
@@ skipping 35 matching lines @@
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"mime\": \"text/html\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\": {"
                           "    \"previous\": \"\","
                           "    \"current\": \"%s\"}}]",
                           result_id,
                           GetFilename("file.txt").c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
@@ skipping 29 matching lines @@
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitForInterruption(
       item,
       content::DOWNLOAD_INTERRUPT_REASON_SERVER_UNAUTHORIZED,
       base::StringPrintf("[{\"danger\": \"safe\","
                          "  \"incognito\": false,"
                          "  \"paused\": false,"
+                         "  \"finalUrl\": \"%s\","
                          "  \"url\": \"%s\"}]",
+                         download_url.c_str(),
                          download_url.c_str())));
 }
 
 // Test that DownloadsDownloadFunction propagates |headers| to the URLRequest.
 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
                        DownloadExtensionTest_Download_Headers) {
   LoadExtension("downloads_split");
   ASSERT_TRUE(StartEmbeddedTestServer());
   std::string download_url =
       embedded_test_server()
@@ skipping 18 matching lines @@
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"mime\": \"application/octet-stream\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\": {"
                           "    \"previous\": \"\","
                           "    \"current\": \"%s\"}}]",
                           result_id,
                           GetFilename("headers-succeed.txt").c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
@@ skipping 36 matching lines @@
 
   ASSERT_TRUE(WaitForInterruption(
       item,
       content::DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT,
       base::StringPrintf("[{\"danger\": \"safe\","
                          "  \"incognito\": false,"
                          "  \"bytesReceived\": 0.0,"
                          "  \"fileSize\": 0.0,"
                          "  \"mime\": \"\","
                          "  \"paused\": false,"
+                         "  \"finalUrl\": \"%s\","
                          "  \"url\": \"%s\"}]",
+                         download_url.c_str(),
                          download_url.c_str())));
 }
 
 // Test that DownloadsDownloadFunction propagates the Authorization header
 // correctly.
 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
                        DownloadExtensionTest_Download_AuthBasic) {
   LoadExtension("downloads_split");
   ASSERT_TRUE(StartEmbeddedTestServer());
   std::string download_url =
@@ skipping 18 matching lines @@
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"bytesReceived\": 0.0,"
                           "  \"mime\": \"text/html\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"state\": {"
                           "    \"previous\": \"in_progress\","
                           "    \"current\": \"complete\"}}]",
                           result_id)));
 }
 
@@ skipping 24 matching lines @@
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"mime\": \"application/octet-stream\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\": {"
                           "    \"previous\": \"\","
                           "    \"current\": \"%s\"}}]",
                           result_id,
                           GetFilename("post-succeed.txt").c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
@@ skipping 36 matching lines @@
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitForInterruption(
       item,
       content::DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT,
       base::StringPrintf("[{\"danger\": \"safe\","
                          "  \"incognito\": false,"
                          "  \"mime\": \"\","
                          "  \"paused\": false,"
                          "  \"id\": %d,"
+                         "  \"finalUrl\": \"%s\","
                          "  \"url\": \"%s\"}]",
                          result_id,
+                         download_url.c_str(),
                          download_url.c_str())));
 }
 
 // Test that downloadPostSuccess would fail if the resource requires the POST
 // method, and chrome fails to propagate the |body| parameter back to the
 // server. This tests both that testserver.py does not succeed when it should
 // fail, and this tests how the downloads extension api exposes the failure to
 // extensions.
 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
                        DownloadExtensionTest_Download_Post_NoBody) {
@@ skipping 21 matching lines @@
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitForInterruption(
       item,
       content::DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT,
       base::StringPrintf("[{\"danger\": \"safe\","
                          "  \"incognito\": false,"
                          "  \"mime\": \"\","
                          "  \"paused\": false,"
                          "  \"id\": %d,"
+                         "  \"finalUrl\": \"%s\","
                          "  \"url\": \"%s\"}]",
                          result_id,
+                         download_url.c_str(),
                          download_url.c_str())));
 }
 
 // Test that cancel()ing an in-progress download causes its state to transition
 // to interrupted, and test that that state transition is detectable by an
 // onChanged event listener.  TODO(benjhayden): Test other sources of
 // interruptions such as server death.
 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
                        DownloadExtensionTest_Download_Cancel) {
   LoadExtension("downloads_split");
@@ skipping 14 matching lines @@
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"mime\": \"application/octet-stream\","
                           "  \"paused\": false,"
                           "  \"id\": %d,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   item->Cancel(true);
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"error\": {\"current\":\"USER_CANCELED\"},"
                           "  \"state\": {"
                           "    \"previous\": \"in_progress\","
                           "    \"current\": \"interrupted\"}}]",
                           result_id)));
@@ skipping 39 matching lines @@
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\": {"
                           "    \"previous\": \"\","
                           "    \"current\": \"%s\"}}]",
                           result_id,
                           GetFilename("on_record.txt").c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnChanged::kEventName,
@@ skipping 29 matching lines @@
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   // Wait for the onCreated and onDeterminingFilename events.
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Respond to the onDeterminingFilename.
@@ skipping 50 matching lines @@
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   // Wait for the onCreated and onDeterminingFilename events.
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
       base::StringPrintf("[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(
       downloads::OnDeterminingFilename::kEventName,
       base::StringPrintf("[{\"id\": %d,"
                          "  \"filename\":\"slow.txt\"}]",
                          result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Do not respond to the onDeterminingFilename.
@@ skipping 34 matching lines @@
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   // Wait for the onCreated and onDeterminingFilename events.
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
       base::StringPrintf("[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(
       downloads::OnDeterminingFilename::kEventName,
       base::StringPrintf("[{\"id\": %d,"
                          "  \"filename\":\"slow.txt\"}]",
                          result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Respond to the onDeterminingFilename.
@@ skipping 57 matching lines @@
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Respond to the onDeterminingFilename.
@@ skipping 56 matching lines @@
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Respond to the onDeterminingFilename.
@@ skipping 44 matching lines @@
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Respond to the onDeterminingFilename.
@@ skipping 44 matching lines @@
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Respond to the onDeterminingFilename.
@@ skipping 51 matching lines @@
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Respond to the onDeterminingFilename.
@@ skipping 44 matching lines @@
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Respond to the onDeterminingFilename.
@@ skipping 44 matching lines @@
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Respond to the onDeterminingFilename.
@@ skipping 44 matching lines @@
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Respond to the onDeterminingFilename. Absolute paths should be rejected.
@@ skipping 45 matching lines @@
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Respond to the onDeterminingFilename. Empty basenames should be rejected.
@@ skipping 45 matching lines @@
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Respond to the onDeterminingFilename.
@@ skipping 35 matching lines @@
   ScopedCancellingItem canceller2(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Respond to the onDeterminingFilename.
@@ skipping 47 matching lines @@
   ASSERT_TRUE(item);
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Respond to the onDeterminingFilename.
@@ skipping 35 matching lines @@
   ScopedCancellingItem canceller2(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Respond to the onDeterminingFilename.
@@ skipping 58 matching lines @@
   ScopedCancellingItem canceller(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
   // Remove a determiner while waiting for it.
@@ skipping 35 matching lines @@
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   // Wait for the onCreated and onDeterminingFilename events.
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"incognito\": false,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
@@ skipping 39 matching lines @@
   ScopedCancellingItem canceller2(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": true,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   // On-Record renderers should not see events for off-record items.
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"incognito\": true,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
@@ skipping 56 matching lines @@
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   // Wait for the onCreated and onDeterminingFilename events.
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": false,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"incognito\": false,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
@@ skipping 39 matching lines @@
   ScopedCancellingItem canceller2(item);
   ASSERT_EQ(download_url, item->GetOriginalUrl().spec());
 
   ASSERT_TRUE(WaitFor(downloads::OnCreated::kEventName,
                       base::StringPrintf(
                           "[{\"danger\": \"safe\","
                           "  \"incognito\": true,"
                           "  \"id\": %d,"
                           "  \"mime\": \"text/plain\","
                           "  \"paused\": false,"
+                          "  \"finalUrl\": \"%s\","
                           "  \"url\": \"%s\"}]",
                           result_id,
+                          download_url.c_str(),
                           download_url.c_str())));
   ASSERT_TRUE(WaitFor(downloads::OnDeterminingFilename::kEventName,
                       base::StringPrintf(
                           "[{\"id\": %d,"
                           "  \"incognito\": true,"
                           "  \"filename\":\"slow.txt\"}]",
                           result_id)));
   ASSERT_TRUE(item->GetTargetFilePath().empty());
   ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState());
 
@@ skipping 332 matching lines @@
   EXPECT_EQ(downloads::FILENAME_CONFLICT_ACTION_PROMPT, conflict_action);
   EXPECT_FALSE(warnings.empty());
   EXPECT_EQ(Warning::kDownloadFilenameConflict,
             warnings.begin()->warning_type());
   EXPECT_EQ("incumbent", warnings.begin()->extension_id());
 }
 
 }  // namespace extensions
 
 #endif  // http://crbug.com/306144