Rename DictionaryValue's SetStringFromUTF16() to SetString() (and overload).

chrome/browser/dom_ui/dom_ui.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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/dom_ui.h"
 
 #include "base/i18n/rtl.h"
 #include "base/json/json_writer.h"
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 98 matching lines @@
   dom_ui_ = dom_ui;
   RegisterMessages();
   return this;
 }
 
 // DOMMessageHandler, protected: ----------------------------------------------
 
 void DOMMessageHandler::SetURLAndTitle(DictionaryValue* dictionary,
                                        string16 title,
                                        const GURL& gurl) {
-  string16 url16 = UTF8ToUTF16(gurl.spec());
-  dictionary->SetStringFromUTF16(L"url", url16);
+  dictionary->SetString("url", gurl.spec());
 
   bool using_url_as_the_title = false;
   if (title.empty()) {
     using_url_as_the_title = true;
-    title = url16;
+    title = UTF8ToUTF16(gurl.spec());
   }
 
   // Since the title can contain BiDi text, we need to mark the text as either
   // RTL or LTR, depending on the characters in the string. If we use the URL
   // as the title, we mark the title as LTR since URLs are always treated as
   // left to right strings.
   string16 title_to_set(title);
   if (base::i18n::IsRTL()) {
     if (using_url_as_the_title) {
       base::i18n::WrapStringWithLTRFormatting(&title_to_set);
     } else {
       bool success =
           base::i18n::AdjustStringForLocaleDirection(title, &title_to_set);
       DCHECK(success ? (title != title_to_set) : (title == title_to_set));
     }
   }
-  dictionary->SetStringFromUTF16(L"title", title_to_set);
+  dictionary->SetString("title", title_to_set);
 }
 
 bool DOMMessageHandler::ExtractIntegerValue(const Value* value, int* out_int) {
   if (value && value->GetType() == Value::TYPE_LIST) {
     const ListValue* list_value = static_cast<const ListValue*>(value);
     std::string string_value;
     if (list_value->GetString(0, &string_value)) {
       base::StringToInt(string_value, out_int);
       return true;
     }
   }
   return false;
 }
 
 std::wstring DOMMessageHandler::ExtractStringValue(const Value* value) {
   if (value && value->GetType() == Value::TYPE_LIST) {
     const ListValue* list_value = static_cast<const ListValue*>(value);
     std::wstring wstring_value;
     if (list_value->GetString(0, &wstring_value))
       return wstring_value;
   }
   return std::wstring();
 }