| Index: chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
|
| diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
|
| index e3d02abbb533e4d8d5cac8d522f28414210069f2..51def5dae6dadd84728f9a105242afc1079f52ba 100644
|
| --- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
|
| +++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
|
| @@ -1698,7 +1698,9 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"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(
|
| @@ -1806,7 +1808,9 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"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,
|
| @@ -1849,7 +1853,9 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"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(
|
| @@ -1885,7 +1891,9 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"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(
|
| @@ -1929,7 +1937,9 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"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(
|
| @@ -1984,7 +1994,9 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"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(
|
| @@ -2035,7 +2047,9 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"incognito\": false,"
|
| " \"mime\": \"text/html\","
|
| " \"paused\": false,"
|
| + " \"finalUrl\": \"%s\","
|
| " \"url\": \"%s\"}]",
|
| + download_url.c_str(),
|
| download_url.c_str())));
|
| }
|
|
|
| @@ -2074,7 +2088,9 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"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(
|
| @@ -2131,7 +2147,9 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"fileSize\": 0.0,"
|
| " \"mime\": \"\","
|
| " \"paused\": false,"
|
| + " \"finalUrl\": \"%s\","
|
| " \"url\": \"%s\"}]",
|
| + download_url.c_str(),
|
| download_url.c_str())));
|
| }
|
|
|
| @@ -2170,7 +2188,9 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"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(
|
| @@ -2215,7 +2235,9 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"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(
|
| @@ -2272,8 +2294,10 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"mime\": \"\","
|
| " \"paused\": false,"
|
| " \"id\": %d,"
|
| + " \"finalUrl\": \"%s\","
|
| " \"url\": \"%s\"}]",
|
| result_id,
|
| + download_url.c_str(),
|
| download_url.c_str())));
|
| }
|
|
|
| @@ -2315,8 +2339,10 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"mime\": \"\","
|
| " \"paused\": false,"
|
| " \"id\": %d,"
|
| + " \"finalUrl\": \"%s\","
|
| " \"url\": \"%s\"}]",
|
| result_id,
|
| + download_url.c_str(),
|
| download_url.c_str())));
|
| }
|
|
|
| @@ -2351,8 +2377,10 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"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,
|
| @@ -2412,7 +2440,9 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"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(
|
| @@ -2462,8 +2492,10 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"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(
|
| @@ -2534,8 +2566,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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,
|
| @@ -2590,8 +2624,10 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
|
| " \"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,
|
| @@ -2669,8 +2705,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
| @@ -2747,8 +2785,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
| @@ -2813,8 +2853,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
| @@ -2879,8 +2921,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
| @@ -2952,8 +2996,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
| @@ -3018,8 +3064,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
| @@ -3084,8 +3132,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
| @@ -3150,8 +3200,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
| @@ -3217,8 +3269,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
| @@ -3284,8 +3338,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
| @@ -3341,8 +3397,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
| @@ -3410,8 +3468,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
| @@ -3467,8 +3527,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
| @@ -3547,8 +3609,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
| @@ -3604,8 +3668,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
| @@ -3665,8 +3731,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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,
|
| @@ -3743,8 +3811,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
| @@ -3804,8 +3874,10 @@ IN_PROC_BROWSER_TEST_F(
|
| " \"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(
|
|
|