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

chrome/browser/download/download_query_unittest.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/download/download_query.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 186 matching lines @@
       static_cast<content::BrowserContext*>(NULL)));
   base::FilePath match_filename(FILE_PATH_LITERAL("query"));
   EXPECT_CALL(mock(0), GetTargetFilePath()).WillRepeatedly(ReturnRef(
       match_filename));
   base::FilePath fail_filename(FILE_PATH_LITERAL("fail"));
   EXPECT_CALL(mock(1), GetTargetFilePath()).WillRepeatedly(ReturnRef(
       fail_filename));
   GURL fail_url("http://example.com/fail");
   EXPECT_CALL(mock(0), GetOriginalUrl()).WillRepeatedly(ReturnRef(fail_url));
   EXPECT_CALL(mock(1), GetOriginalUrl()).WillRepeatedly(ReturnRef(fail_url));
+  EXPECT_CALL(mock(0), GetURL()).WillRepeatedly(ReturnRef(fail_url));
+  EXPECT_CALL(mock(1), GetURL()).WillRepeatedly(ReturnRef(fail_url));
   std::vector<std::string> query_terms;
   query_terms.push_back("query");
   AddFilter(DownloadQuery::FILTER_QUERY, query_terms);
   ExpectStandardFilterResults();
 }
 
-TEST_F(DownloadQueryTest, DownloadQueryTest_FilterGenericQueryUrl) {
+TEST_F(DownloadQueryTest, DownloadQueryTest_FilterGenericQueryOriginalUrl) {
   CreateMocks(2);
   EXPECT_CALL(mock(0), GetBrowserContext()).WillRepeatedly(Return(
       static_cast<content::BrowserContext*>(NULL)));
   EXPECT_CALL(mock(1), GetBrowserContext()).WillRepeatedly(Return(
       static_cast<content::BrowserContext*>(NULL)));
   base::FilePath fail_filename(FILE_PATH_LITERAL("fail"));
   EXPECT_CALL(mock(0), GetTargetFilePath()).WillRepeatedly(ReturnRef(
       fail_filename));
   EXPECT_CALL(mock(1), GetTargetFilePath()).WillRepeatedly(ReturnRef(
       fail_filename));
   GURL match_url("http://query.com/query");
   EXPECT_CALL(mock(0), GetOriginalUrl()).WillRepeatedly(ReturnRef(match_url));
   GURL fail_url("http://example.com/fail");
   EXPECT_CALL(mock(1), GetOriginalUrl()).WillRepeatedly(ReturnRef(fail_url));
+  EXPECT_CALL(mock(0), GetURL()).WillRepeatedly(ReturnRef(fail_url));
+  EXPECT_CALL(mock(1), GetURL()).WillRepeatedly(ReturnRef(fail_url));
   std::vector<std::string> query_terms;
   query_terms.push_back("query");
   AddFilter(DownloadQuery::FILTER_QUERY, query_terms);
+  ExpectStandardFilterResults();
+}
+
+TEST_F(DownloadQueryTest,
+       DownloadQueryTest_FilterGenericQueryOriginalUrlUnescaping) {
+  CreateMocks(2);
+  EXPECT_CALL(mock(0), GetBrowserContext()).WillRepeatedly(Return(
+      static_cast<content::BrowserContext*>(NULL)));
+  EXPECT_CALL(mock(1), GetBrowserContext()).WillRepeatedly(Return(
+      static_cast<content::BrowserContext*>(NULL)));
+  base::FilePath fail_filename(FILE_PATH_LITERAL("fail"));
+  EXPECT_CALL(mock(0), GetTargetFilePath()).WillRepeatedly(ReturnRef(
+      fail_filename));
+  EXPECT_CALL(mock(1), GetTargetFilePath()).WillRepeatedly(ReturnRef(
+      fail_filename));
+  GURL match_url("http://q%75%65%72y.c%6Fm/%71uer%79");
+  GURL fail_url("http://%65xampl%65.com/%66ai%6C");
+  EXPECT_CALL(mock(0), GetOriginalUrl()).WillRepeatedly(ReturnRef(match_url));
+  EXPECT_CALL(mock(1), GetOriginalUrl()).WillRepeatedly(ReturnRef(fail_url));
+  EXPECT_CALL(mock(0), GetURL()).WillRepeatedly(ReturnRef(fail_url));
+  EXPECT_CALL(mock(1), GetURL()).WillRepeatedly(ReturnRef(fail_url));
+  std::vector<std::string> query_terms;
+  query_terms.push_back("query");
+  AddFilter(DownloadQuery::FILTER_QUERY, query_terms);
+  ExpectStandardFilterResults();
+}
+
+TEST_F(DownloadQueryTest, DownloadQueryTest_FilterGenericQueryUrl) {
+  CreateMocks(2);
+  EXPECT_CALL(mock(0), GetBrowserContext()).WillRepeatedly(Return(
+      static_cast<content::BrowserContext*>(NULL)));
+  EXPECT_CALL(mock(1), GetBrowserContext()).WillRepeatedly(Return(
+      static_cast<content::BrowserContext*>(NULL)));
+  base::FilePath fail_filename(FILE_PATH_LITERAL("fail"));
+  EXPECT_CALL(mock(0), GetTargetFilePath()).WillRepeatedly(ReturnRef(
+      fail_filename));
+  EXPECT_CALL(mock(1), GetTargetFilePath()).WillRepeatedly(ReturnRef(
+      fail_filename));
+  GURL match_url("http://query.com/query");
+  GURL fail_url("http://example.com/fail");
+  EXPECT_CALL(mock(0), GetOriginalUrl()).WillRepeatedly(ReturnRef(fail_url));
+  EXPECT_CALL(mock(1), GetOriginalUrl()).WillRepeatedly(ReturnRef(fail_url));
+  EXPECT_CALL(mock(0), GetURL()).WillRepeatedly(ReturnRef(match_url));
+  EXPECT_CALL(mock(1), GetURL()).WillRepeatedly(ReturnRef(fail_url));
+  std::vector<std::string> query_terms;
+  query_terms.push_back("query");
+  AddFilter(DownloadQuery::FILTER_QUERY, query_terms);
+  ExpectStandardFilterResults();
+}
+
+TEST_F(DownloadQueryTest, DownloadQueryTest_FilterGenericQueryUrlUnescaping) {
+  CreateMocks(2);
+  EXPECT_CALL(mock(0), GetBrowserContext()).WillRepeatedly(Return(
+      static_cast<content::BrowserContext*>(NULL)));
+  EXPECT_CALL(mock(1), GetBrowserContext()).WillRepeatedly(Return(
+      static_cast<content::BrowserContext*>(NULL)));
+  base::FilePath fail_filename(FILE_PATH_LITERAL("fail"));
+  EXPECT_CALL(mock(0), GetTargetFilePath()).WillRepeatedly(ReturnRef(
+      fail_filename));
+  EXPECT_CALL(mock(1), GetTargetFilePath()).WillRepeatedly(ReturnRef(
+      fail_filename));
+  GURL match_url("http://%71uer%79.com/qu%65ry");
+  GURL fail_url("http://e%78am%70le.com/f%61il");
+  EXPECT_CALL(mock(0), GetOriginalUrl()).WillRepeatedly(ReturnRef(fail_url));
+  EXPECT_CALL(mock(1), GetOriginalUrl()).WillRepeatedly(ReturnRef(fail_url));
+  EXPECT_CALL(mock(0), GetURL()).WillRepeatedly(ReturnRef(match_url));
+  EXPECT_CALL(mock(1), GetURL()).WillRepeatedly(ReturnRef(fail_url));
+  std::vector<std::string> query_terms;
+  query_terms.push_back("query");
+  AddFilter(DownloadQuery::FILTER_QUERY, query_terms);
   ExpectStandardFilterResults();
 }
 
 TEST_F(DownloadQueryTest, DownloadQueryTest_FilterGenericQueryFilenameI18N) {
   CreateMocks(2);
   EXPECT_CALL(mock(0), GetBrowserContext()).WillRepeatedly(Return(
       static_cast<content::BrowserContext*>(NULL)));
   EXPECT_CALL(mock(1), GetBrowserContext()).WillRepeatedly(Return(
       static_cast<content::BrowserContext*>(NULL)));
   const base::FilePath::StringType kTestString(
 #if defined(OS_POSIX)
       "/\xe4\xbd\xa0\xe5\xa5\xbd\xe4\xbd\xa0\xe5\xa5\xbd"
 #elif defined(OS_WIN)
       L"/\x4f60\x597d\x4f60\x597d"
 #endif
       );
   base::FilePath match_filename(kTestString);
   EXPECT_CALL(mock(0), GetTargetFilePath()).WillRepeatedly(ReturnRef(
       match_filename));
   base::FilePath fail_filename(FILE_PATH_LITERAL("fail"));
   EXPECT_CALL(mock(1), GetTargetFilePath()).WillRepeatedly(ReturnRef(
       fail_filename));
   GURL fail_url("http://example.com/fail");
   EXPECT_CALL(mock(0), GetOriginalUrl()).WillRepeatedly(ReturnRef(fail_url));
   EXPECT_CALL(mock(1), GetOriginalUrl()).WillRepeatedly(ReturnRef(fail_url));
+  EXPECT_CALL(mock(0), GetURL()).WillRepeatedly(ReturnRef(fail_url));
+  EXPECT_CALL(mock(1), GetURL()).WillRepeatedly(ReturnRef(fail_url));
   std::vector<base::FilePath::StringType> query_terms;
   query_terms.push_back(kTestString);
   AddFilter(DownloadQuery::FILTER_QUERY, query_terms);
   ExpectStandardFilterResults();
 }
 
 TEST_F(DownloadQueryTest, DownloadQueryTest_FilterFilenameRegex) {
   CreateMocks(2);
   base::FilePath match_filename(FILE_PATH_LITERAL("query"));
   EXPECT_CALL(mock(0), GetTargetFilePath()).WillRepeatedly(ReturnRef(
@@ skipping 22 matching lines @@
   base::FilePath match_filename(FILE_PATH_LITERAL("query"));
   EXPECT_CALL(mock(0), GetTargetFilePath()).WillRepeatedly(ReturnRef(
       match_filename));
   base::FilePath fail_filename(FILE_PATH_LITERAL("fail"));
   EXPECT_CALL(mock(1), GetTargetFilePath()).WillRepeatedly(ReturnRef(
       fail_filename));
   AddFilter(DownloadQuery::FILTER_FILENAME, match_filename.value().c_str());
   ExpectStandardFilterResults();
 }
 
+TEST_F(DownloadQueryTest, DownloadQueryTest_FilterOriginalUrlRegex) {
+  CreateMocks(2);
+  GURL match_url("http://query.com/query");
+  EXPECT_CALL(mock(0), GetOriginalUrl()).WillRepeatedly(ReturnRef(match_url));
+  GURL fail_url("http://example.com/fail");
+  EXPECT_CALL(mock(1), GetOriginalUrl()).WillRepeatedly(ReturnRef(fail_url));
+  AddFilter(DownloadQuery::FILTER_ORIGINAL_URL_REGEX, "query");
+  ExpectStandardFilterResults();
+}
+
+TEST_F(DownloadQueryTest, DownloadQueryTest_SortOriginalUrl) {
+  CreateMocks(2);
+  GURL b_url("http://example.com/b");
+  EXPECT_CALL(mock(0), GetOriginalUrl()).WillRepeatedly(ReturnRef(b_url));
+  GURL a_url("http://example.com/a");
+  EXPECT_CALL(mock(1), GetOriginalUrl()).WillRepeatedly(ReturnRef(a_url));
+  query()->AddSorter(
+      DownloadQuery::SORT_ORIGINAL_URL, DownloadQuery::ASCENDING);
+  ExpectSortInverted();
+}
+
+TEST_F(DownloadQueryTest, DownloadQueryTest_FilterOriginalUrl) {
+  CreateMocks(2);
+  GURL match_url("http://query.com/query");
+  EXPECT_CALL(mock(0), GetOriginalUrl()).WillRepeatedly(ReturnRef(match_url));
+  GURL fail_url("http://example.com/fail");
+  EXPECT_CALL(mock(1), GetOriginalUrl()).WillRepeatedly(ReturnRef(fail_url));
+  AddFilter(DownloadQuery::FILTER_ORIGINAL_URL, match_url.spec().c_str());
+  ExpectStandardFilterResults();
+}
+
 TEST_F(DownloadQueryTest, DownloadQueryTest_FilterUrlRegex) {
   CreateMocks(2);
   GURL match_url("http://query.com/query");
-  EXPECT_CALL(mock(0), GetOriginalUrl()).WillRepeatedly(ReturnRef(match_url));
+  EXPECT_CALL(mock(0), GetURL()).WillRepeatedly(ReturnRef(match_url));
   GURL fail_url("http://example.com/fail");
-  EXPECT_CALL(mock(1), GetOriginalUrl()).WillRepeatedly(ReturnRef(fail_url));
+  EXPECT_CALL(mock(1), GetURL()).WillRepeatedly(ReturnRef(fail_url));
   AddFilter(DownloadQuery::FILTER_URL_REGEX, "query");
   ExpectStandardFilterResults();
 }
 
 TEST_F(DownloadQueryTest, DownloadQueryTest_SortUrl) {
   CreateMocks(2);
   GURL b_url("http://example.com/b");
-  EXPECT_CALL(mock(0), GetOriginalUrl()).WillRepeatedly(ReturnRef(b_url));
+  EXPECT_CALL(mock(0), GetURL()).WillRepeatedly(ReturnRef(b_url));
   GURL a_url("http://example.com/a");
-  EXPECT_CALL(mock(1), GetOriginalUrl()).WillRepeatedly(ReturnRef(a_url));
+  EXPECT_CALL(mock(1), GetURL()).WillRepeatedly(ReturnRef(a_url));
   query()->AddSorter(DownloadQuery::SORT_URL, DownloadQuery::ASCENDING);
   ExpectSortInverted();
 }
 
 TEST_F(DownloadQueryTest, DownloadQueryTest_FilterUrl) {
   CreateMocks(2);
   GURL match_url("http://query.com/query");
-  EXPECT_CALL(mock(0), GetOriginalUrl()).WillRepeatedly(ReturnRef(match_url));
+  EXPECT_CALL(mock(0), GetURL()).WillRepeatedly(ReturnRef(match_url));
   GURL fail_url("http://example.com/fail");
-  EXPECT_CALL(mock(1), GetOriginalUrl()).WillRepeatedly(ReturnRef(fail_url));
+  EXPECT_CALL(mock(1), GetURL()).WillRepeatedly(ReturnRef(fail_url));
   AddFilter(DownloadQuery::FILTER_URL, match_url.spec().c_str());
   ExpectStandardFilterResults();
 }
 
 TEST_F(DownloadQueryTest, DownloadQueryTest_FilterCallback) {
   CreateMocks(2);
   CHECK(query()->AddFilter(base::Bind(&IdNotEqual, 1)));
   ExpectStandardFilterResults();
 }
 
@@ skipping 346 matching lines @@
   base::Time start = base::Time::Now();
   Search();
   base::Time end = base::Time::Now();
   double nanos = (end - start).InMillisecondsF() * 1000.0 * 1000.0;
   double nanos_per_item = nanos / static_cast<double>(kNumItems);
   double nanos_per_item_per_filter = nanos_per_item
     / static_cast<double>(kNumFilters);
   std::cout << "Search took " << nanos_per_item_per_filter
             << " nanoseconds per item per filter.\n";
 }