Replace string16 with base::string16.

chrome/browser/download/download_query.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 <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 29 matching lines @@
 template <typename T> bool GetAs(const base::Value& in, T* out);
 template<> bool GetAs(const base::Value& in, bool* out) {
   return in.GetAsBoolean(out);
 }
 template<> bool GetAs(const base::Value& in, int* out) {
   return in.GetAsInteger(out);
 }
 template<> bool GetAs(const base::Value& in, std::string* out) {
   return in.GetAsString(out);
 }
-template<> bool GetAs(const base::Value& in, string16* out) {
+template<> bool GetAs(const base::Value& in, base::string16* out) {
   return in.GetAsString(out);
 }
 template<> bool GetAs(const base::Value& in, std::vector<string16>* out) {
   out->clear();
   const base::ListValue* list = NULL;
   if (!in.GetAsList(&list))
     return false;
   for (size_t i = 0; i < list->GetSize(); ++i) {
-    string16 element;
+    base::string16 element;
     if (!list->GetString(i, &element)) {
       out->clear();
       return false;
     }
     out->push_back(element);
   }
   return true;
 }
 
 // The next several functions are helpers for making Callbacks that access
 // DownloadItem fields.
 
 static bool MatchesQuery(
     const std::vector<string16>& query_terms,
     const DownloadItem& item) {
   DCHECK(!query_terms.empty());
-  string16 url_raw(UTF8ToUTF16(item.GetOriginalUrl().spec()));
-  string16 url_formatted = url_raw;
+  base::string16 url_raw(UTF8ToUTF16(item.GetOriginalUrl().spec()));
+  base::string16 url_formatted = url_raw;
   if (item.GetBrowserContext()) {
     Profile* profile = Profile::FromBrowserContext(item.GetBrowserContext());
     url_formatted = net::FormatUrl(
         item.GetOriginalUrl(),
         profile->GetPrefs()->GetString(prefs::kAcceptLanguages));
   }
-  string16 path(item.GetTargetFilePath().LossyDisplayName());
+  base::string16 path(item.GetTargetFilePath().LossyDisplayName());
 
   for (std::vector<string16>::const_iterator it = query_terms.begin();
        it != query_terms.end(); ++it) {
-    string16 term = base::i18n::ToLower(*it);
+    base::string16 term = base::i18n::ToLower(*it);
     if (!base::i18n::StringSearchIgnoringCaseAndAccents(
             term, url_raw, NULL, NULL) &&
         !base::i18n::StringSearchIgnoringCaseAndAccents(
             term, url_formatted, NULL, NULL) &&
         !base::i18n::StringSearchIgnoringCaseAndAccents(
             term, path, NULL, NULL)) {
       return false;
     }
   }
   return true;
@@ skipping 26 matching lines @@
 
 static bool GetDangerAccepted(const DownloadItem& item) {
   return (item.GetDangerType() ==
           content::DOWNLOAD_DANGER_TYPE_USER_VALIDATED);
 }
 
 static bool GetExists(const DownloadItem& item) {
   return !item.GetFileExternallyRemoved();
 }
 
-static string16 GetFilename(const DownloadItem& item) {
+static base::string16 GetFilename(const DownloadItem& item) {
   // This filename will be compared with strings that could be passed in by the
   // user, who only sees LossyDisplayNames.
   return item.GetTargetFilePath().LossyDisplayName();
 }
 
 static std::string GetFilenameUTF8(const DownloadItem& item) {
   return UTF16ToUTF8(GetFilename(item));
 }
 
 static std::string GetUrl(const DownloadItem& item) {
@@ skipping 286 matching lines @@
 
 void DownloadQuery::FinishSearch(DownloadQuery::DownloadVector* results) const {
   if (!sorters_.empty())
     std::partial_sort(results->begin(),
                       results->begin() + std::min(limit_, results->size()),
                       results->end(),
                       DownloadComparator(sorters_));
   if (results->size() > limit_)
     results->resize(limit_);
 }