A few minor changes to the chrome.downloads 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 <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 110 matching lines @@
   scoped_ptr<base::Value> value(Value::CreateStringValue(cpp_value));
   CHECK(query_.AddFilter(name, *value.get()));
 }
 
 template<> void DownloadQueryTest::AddFilter(
     DownloadQuery::FilterType name, const char16* cpp_value) {
   scoped_ptr<base::Value> value(Value::CreateStringValue(string16(cpp_value)));
   CHECK(query_.AddFilter(name, *value.get()));
 }
 
+template<> void DownloadQueryTest::AddFilter(
+    DownloadQuery::FilterType name, std::vector<string16> cpp_value) {
+  scoped_ptr<base::ListValue> list(new base::ListValue());
+  for (std::vector<string16>::const_iterator it = cpp_value.begin();
+       it != cpp_value.end(); ++it) {
+    list->Append(Value::CreateStringValue(*it));
+  }
+  CHECK(query_.AddFilter(name, *list.get()));
+}
+
+template<> void DownloadQueryTest::AddFilter(
+    DownloadQuery::FilterType name, std::vector<std::string> cpp_value) {
+  scoped_ptr<base::ListValue> list(new base::ListValue());
+  for (std::vector<std::string>::const_iterator it = cpp_value.begin();
+       it != cpp_value.end(); ++it) {
+    list->Append(Value::CreateStringValue(*it));
+  }
+  CHECK(query_.AddFilter(name, *list.get()));
+}
+
 #if defined(OS_WIN)
 template<> void DownloadQueryTest::AddFilter(
     DownloadQuery::FilterType name, std::wstring cpp_value) {
   scoped_ptr<base::Value> value(Value::CreateStringValue(cpp_value));
   CHECK(query_.AddFilter(name, *value.get()));
 }
 #endif
 
 TEST_F(DownloadQueryTest, DownloadQueryTest_ZeroItems) {
   Search();
@@ skipping 29 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));
-  AddFilter(DownloadQuery::FILTER_QUERY, "query");
+  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");
   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_QUERY, "query");
+  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));
-  AddFilter(DownloadQuery::FILTER_QUERY, kTestString);
+  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(
       match_filename));
   base::FilePath fail_filename(FILE_PATH_LITERAL("fail"));
   EXPECT_CALL(mock(1), GetTargetFilePath()).WillRepeatedly(ReturnRef(
@@ skipping 347 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";
 }