Remove deprecated wstring Get(As)String() methods from Value, etc.

chrome/test/automation/tab_proxy.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/test/automation/tab_proxy.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
+#include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/test/automation/automation_constants.h"
 #include "chrome/test/automation/automation_messages.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "googleurl/src/gurl.h"
 
 bool TabProxy::GetTabTitle(std::wstring* title) const {
   if (!is_valid())
     return false;
@@ skipping 229 matching lines @@
 }
 
 bool TabProxy::ExecuteAndExtractString(const std::wstring& frame_xpath,
                                        const std::wstring& jscript,
                                        std::wstring* string_value) {
   Value* root = NULL;
   bool succeeded = ExecuteAndExtractValue(frame_xpath, jscript, &root);
   if (!succeeded)
     return false;
 
-  std::wstring read_value;
   DCHECK(root->IsType(Value::TYPE_LIST));
   Value* value = NULL;
   succeeded = static_cast<ListValue*>(root)->Get(0, &value);
   if (succeeded) {
+    string16 read_value;
     succeeded = value->GetAsString(&read_value);
     if (succeeded) {
-      string_value->swap(read_value);
+      // TODO(viettrungluu): remove conversion. (But should |jscript| be UTF-8?)
+      *string_value = UTF16ToWideHack(read_value);
     }
   }
 
   delete root;
   return succeeded;
 }
 
 bool TabProxy::ExecuteAndExtractBool(const std::wstring& frame_xpath,
                                      const std::wstring& jscript,
                                      bool* bool_value) {
@@ skipping 537 matching lines @@
                                                       json));
 }
 
 void TabProxy::FirstObjectAdded() {
   AddRef();
 }
 
 void TabProxy::LastObjectRemoved() {
   Release();
 }