Remove Value/StringValue's ...UTF16() methods in favour of overloading.

chrome/browser/dom_ui/history2_ui.cc

 // Copyright (c) 2010 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/dom_ui/history2_ui.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 204 matching lines @@
 
   // Get URLs.
   std::set<GURL> urls;
   const ListValue* list_value = static_cast<const ListValue*>(value);
   for (ListValue::const_iterator v = list_value->begin() + 1;
        v != list_value->end(); ++v) {
     if ((*v)->GetType() != Value::TYPE_STRING)
       continue;
     const StringValue* string_value = static_cast<const StringValue*>(*v);
     string16 string16_value;
-    if (!string_value->GetAsUTF16(&string16_value))
+    if (!string_value->GetAsString(&string16_value))
       continue;
     urls.insert(GURL(string16_value));
   }
 
   HistoryService* hs =
       dom_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS);
   hs->ExpireHistoryBetween(
       urls, begin_time, end_time, &cancelable_delete_consumer_,
       NewCallback(this, &BrowsingHistoryHandler2::RemoveComplete));
 }
@@ skipping 68 matching lines @@
 
   if (value && value->GetType() == Value::TYPE_LIST) {
     const ListValue* list_value = static_cast<const ListValue*>(value);
     Value* list_member;
 
     // Get search string.
     if (list_value->Get(0, &list_member) &&
         list_member->GetType() == Value::TYPE_STRING) {
       const StringValue* string_value =
         static_cast<const StringValue*>(list_member);
-      string_value->GetAsUTF16(query);
+      string_value->GetAsString(query);
     }
 
     // Get search month.
     if (list_value->Get(1, &list_member) &&
         list_member->GetType() == Value::TYPE_STRING) {
       const StringValue* string_value =
         static_cast<const StringValue*>(list_member);
       string16 string16_value;
-      string_value->GetAsUTF16(&string16_value);
+      string_value->GetAsString(&string16_value);
       base::StringToInt(string16_value, month);
     }
   }
 }
 
 history::QueryOptions BrowsingHistoryHandler2::CreateMonthQueryOptions(
     int month) {
   history::QueryOptions options;
 
   // Configure the begin point of the search to the start of the
@@ skipping 71 matching lines @@
 const GURL HistoryUI2::GetHistoryURLWithSearchText(const string16& text) {
   return GURL(std::string(chrome::kChromeUIHistory2URL) + "#q=" +
               EscapeQueryParamValue(UTF16ToUTF8(text), true));
 }
 
 // static
 RefCountedMemory* HistoryUI2::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_HISTORY_FAVICON);
 }