Replace string16 with base::string16.

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 106 matching lines @@
 }
 
 template<> void DownloadQueryTest::AddFilter(
     DownloadQuery::FilterType name, std::string cpp_value) {
   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)));
+  scoped_ptr<base::Value> value(
+      Value::CreateStringValue(base::string16(cpp_value)));
   CHECK(query_.AddFilter(name, *value.get()));
 }
 
 template<> void DownloadQueryTest::AddFilter(
-    DownloadQuery::FilterType name, std::vector<string16> cpp_value) {
+    DownloadQuery::FilterType name, std::vector<base::string16> cpp_value) {
   scoped_ptr<base::ListValue> list(new base::ListValue());
-  for (std::vector<string16>::const_iterator it = cpp_value.begin();
+  for (std::vector<base::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();
@@ skipping 464 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";
 }