DOMUI - Simplify DOMMessageHandler::Extract{Integer,String}Value.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/2074011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47607 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 21 deletions

diff --git a/chrome/browser/dom_ui/dom_ui.cc b/chrome/browser/dom_ui/dom_ui.cc
index 1d6b5b5..976c1dc 100644
--- a/chrome/browser/dom_ui/dom_ui.cc
+++ b/chrome/browser/dom_ui/dom_ui.cc
@@ -146,37 +146,21 @@ void DOMMessageHandler::SetURLAndTitle(DictionaryValue* dictionary,
 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);
-    Value* list_member;
-
-    // Get id.
-    if (list_value->Get(0, &list_member) &&
-        list_member->GetType() == Value::TYPE_STRING) {
-      const StringValue* string_value =
-          static_cast<const StringValue*>(list_member);
-      std::wstring wstring_value;
-      string_value->GetAsString(&wstring_value);
-      *out_int = StringToInt(WideToUTF16Hack(wstring_value));
+    std::string string_value;
+    if (list_value->GetString(0, &string_value)) {
+      *out_int = StringToInt(string_value);
       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);
-    Value* list_member;
-
-    // Get id.
-    if (list_value->Get(0, &list_member) &&
-        list_member->GetType() == Value::TYPE_STRING) {
-      const StringValue* string_value =
-          static_cast<const StringValue*>(list_member);
-      std::wstring wstring_value;
-      string_value->GetAsString(&wstring_value);
+    std::wstring wstring_value;
+    if (list_value->GetString(0, &wstring_value))
       return wstring_value;
-    }
   }
   return std::wstring();
 }