Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(817)

Unified Diff: chrome/browser/ui/tests/browser_uitest.cc

Issue 6312154: Remove wstring from RVH's run Javascript command.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/tests/browser_uitest.cc
===================================================================
--- chrome/browser/ui/tests/browser_uitest.cc (revision 73855)
+++ chrome/browser/ui/tests/browser_uitest.cc (working copy)
@@ -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 @@
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 @@
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);

Powered by Google App Engine
This is Rietveld 408576698