Revert 74118 - Remove wstring from RVH's run Javascript command.
BUG=23581
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6312154
[email protected]
Review URL: http://codereview.chromium.org/6459002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74158 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/dom_ui/bookmarks_ui_uitest.cc b/chrome/browser/dom_ui/bookmarks_ui_uitest.cc
index 476caec..04c37f6 100644
--- a/chrome/browser/dom_ui/bookmarks_ui_uitest.cc
+++ b/chrome/browser/dom_ui/bookmarks_ui_uitest.cc
@@ -5,7 +5,6 @@
#include "chrome/test/ui/ui_test.h"
#include "base/test/test_timeouts.h"
-#include "base/utf_string_conversions.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/automation/browser_proxy.h"
@@ -49,13 +48,13 @@
void AssertIsBookmarksPage(TabProxy* tab) {
// tab->GetCurrentURL is not up to date.
GURL url;
- string16 out;
- ASSERT_TRUE(tab->ExecuteAndExtractString(string16(),
- ASCIIToUTF16("domAutomationController.send(location.protocol)"), &out));
- ASSERT_EQ(ASCIIToUTF16("chrome-extension:"), out);
- ASSERT_TRUE(tab->ExecuteAndExtractString(string16(),
- ASCIIToUTF16("domAutomationController.send(location.pathname)"), &out));
- ASSERT_EQ(ASCIIToUTF16("/main.html"), out);
+ std::wstring out;
+ ASSERT_TRUE(tab->ExecuteAndExtractString(L"",
+ L"domAutomationController.send(location.protocol)", &out));
+ ASSERT_EQ(L"chrome-extension:", out);
+ ASSERT_TRUE(tab->ExecuteAndExtractString(L"",
+ L"domAutomationController.send(location.pathname)", &out));
+ ASSERT_EQ(L"/main.html", out);
}
};
