diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-16 07:13:53 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-16 07:13:53 +0000 |
| commit | dc9a67601b9d8c952bf399f0309519273f82bfd5 (patch) | |
| tree | b618c9da1cef3fa99718897cf523cb8768d4a273 /chrome/test/automation | |
| parent | a6dbaac4225f2fa5a170bdc657ab306390fdc439 (diff) | |
| download | chromium_src-dc9a67601b9d8c952bf399f0309519273f82bfd5.zip chromium_src-dc9a67601b9d8c952bf399f0309519273f82bfd5.tar.gz chromium_src-dc9a67601b9d8c952bf399f0309519273f82bfd5.tar.bz2 | |
Remove deprecated wstring Get(As)String() methods from Value, etc.
BUG=23581
TEST=builds and passes tests
Review URL: http://codereview.chromium.org/3117017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
| -rw-r--r-- | chrome/test/automation/tab_proxy.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc index 15d00d0..cf37561 100644 --- a/chrome/test/automation/tab_proxy.cc +++ b/chrome/test/automation/tab_proxy.cc @@ -7,6 +7,7 @@ #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" @@ -256,14 +257,15 @@ bool TabProxy::ExecuteAndExtractString(const std::wstring& frame_xpath, 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); } } |