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

Unified Diff: chrome/browser/history/multipart_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/history/multipart_uitest.cc
===================================================================
--- chrome/browser/history/multipart_uitest.cc (revision 73855)
+++ chrome/browser/history/multipart_uitest.cc (working copy)
@@ -7,6 +7,7 @@
#include "app/sql/connection.h"
#include "app/sql/statement.h"
#include "base/file_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/automation/browser_proxy.h"
#include "net/test/test_server.h"
@@ -32,9 +33,9 @@
scoped_refptr<TabProxy> tab_proxy(browser_proxy->GetActiveTab());
ASSERT_TRUE(tab_proxy.get());
NavigateToURL(test_server.GetURL("multipart"));
- std::wstring title;
+ string16 title;
EXPECT_TRUE(tab_proxy->GetTabTitle(&title));
- EXPECT_EQ(L"page 9", title);
+ EXPECT_EQ(ASCIIToUTF16("page 9"), title);
CloseBrowserAndServer();
// The browser has shutdown now. Check the contents of the history

Powered by Google App Engine
This is Rietveld 408576698