diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 22:57:43 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 22:57:43 +0000 |
| commit | 548bc0f318c74e9a69973cb43c5403d03d114b52 (patch) | |
| tree | ab09daafc56330f21985c85eabe8adfc671ab7a6 /chrome/browser/automation | |
| parent | 5963b7759a369d178866bdc5868bb601dc5ee262 (diff) | |
| download | chromium_src-548bc0f318c74e9a69973cb43c5403d03d114b52.zip chromium_src-548bc0f318c74e9a69973cb43c5403d03d114b52.tar.gz chromium_src-548bc0f318c74e9a69973cb43c5403d03d114b52.tar.bz2 | |
Remove wstring from RVH's run Javascript command.
BUG=23581
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6458013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
| -rw-r--r-- | chrome/browser/automation/automation_provider_observers.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/automation/testing_automation_provider.cc | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index 7855a21..164d084 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -16,6 +16,7 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/threading/thread_restrictions.h" +#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/automation/automation_provider.h" @@ -1634,8 +1635,10 @@ void PageSnapshotTaker::ExecuteScript(const std::wstring& javascript) { L"window.domAutomationController.setAutomationId(%d);", reply_message_->routing_id()); - render_view_->ExecuteJavascriptInWebFrame(L"", set_automation_id); - render_view_->ExecuteJavascriptInWebFrame(L"", javascript); + render_view_->ExecuteJavascriptInWebFrame(string16(), + WideToUTF16Hack(set_automation_id)); + render_view_->ExecuteJavascriptInWebFrame(string16(), + WideToUTF16Hack(javascript)); } void PageSnapshotTaker::SendMessage(bool success) { diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 4d08873..529a052 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -660,7 +660,7 @@ void TestingAutomationProvider::SetAuth(int tab_handle, // server auth, but it should be OK for now. LoginHandler* handler = iter->second; new NavigationNotificationObserver(tab, this, reply_message, 1, false); - handler->SetAuth(username, password); + handler->SetAuth(WideToUTF16Hack(username), WideToUTF16Hack(password)); return; } } @@ -1139,9 +1139,9 @@ void TestingAutomationProvider::ExecuteJavascript( reply_message_ = reply_message; tab_contents->render_view_host()->ExecuteJavascriptInWebFrame( - frame_xpath, UTF8ToWide(set_automation_id)); + WideToUTF16Hack(frame_xpath), UTF8ToUTF16(set_automation_id)); tab_contents->render_view_host()->ExecuteJavascriptInWebFrame( - frame_xpath, script); + WideToUTF16Hack(frame_xpath), WideToUTF16Hack(script)); } void TestingAutomationProvider::GetConstrainedWindowCount(int handle, |