diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-08 15:42:00 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-08 15:42:00 +0000 |
| commit | 7024d3eea1d8328883736f5cd3cbef480aa0e740 (patch) | |
| tree | 5fc40e7da24d79306321037359bce7bd97bcf36b /chrome/browser/ui/tests | |
| parent | e9ff5e31b28b6ee684ceaf47afe4f483163f6d1d (diff) | |
| download | chromium_src-7024d3eea1d8328883736f5cd3cbef480aa0e740.zip chromium_src-7024d3eea1d8328883736f5cd3cbef480aa0e740.tar.gz chromium_src-7024d3eea1d8328883736f5cd3cbef480aa0e740.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/6312154
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/tests')
| -rw-r--r-- | chrome/browser/ui/tests/browser_uitest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/ui/tests/browser_uitest.cc b/chrome/browser/ui/tests/browser_uitest.cc index c72b245..b4fa016 100644 --- a/chrome/browser/ui/tests/browser_uitest.cc +++ b/chrome/browser/ui/tests/browser_uitest.cc @@ -10,6 +10,7 @@ #include "base/sys_info.h" #include "base/test/test_file_util.h" #include "base/test/test_timeouts.h" +#include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/platform_util.h" @@ -228,9 +229,9 @@ TEST_F(ShowModalDialogTest, FLAKY_BasicTest) { ASSERT_TRUE(browser.get()); scoped_refptr<TabProxy> tab = browser->GetActiveTab(); ASSERT_TRUE(tab.get()); - std::wstring title; + string16 title; ASSERT_TRUE(tab->GetTabTitle(&title)); - ASSERT_EQ(L"SUCCESS", title); + ASSERT_EQ(ASCIIToUTF16("SUCCESS"), title); } class SecurityTest : public UITest { @@ -285,7 +286,7 @@ public: void SetUp() { PathService::Get(base::DIR_TEMP, &tmp_profile_); tmp_profile_ = tmp_profile_.AppendASCII("tmp_profile"); - tmp_profile_ = tmp_profile_.Append(L"Test Chrome G�raldine"); + tmp_profile_ = tmp_profile_.Append(L"Test Chrome G\u00E9raldine"); // Create a fresh, empty copy of this directory. file_util::Delete(tmp_profile_, true); |