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

Unified Diff: chrome/test/ui/layout_plugin_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/test/ui/layout_plugin_uitest.cc
===================================================================
--- chrome/test/ui/layout_plugin_uitest.cc (revision 73855)
+++ chrome/test/ui/layout_plugin_uitest.cc (working copy)
@@ -7,6 +7,7 @@
#include "base/file_path.h"
#include "base/path_service.h"
#include "base/test/test_timeouts.h"
+#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/ui_test_utils.h"
@@ -33,15 +34,15 @@
path = path.AppendASCII("npapi").AppendASCII("layout_test_plugin.html");
NavigateToURL(net::FilePathToFileURL(path));
- std::wstring title;
+ string16 title;
scoped_refptr<TabProxy> tab = GetActiveTab();
ASSERT_TRUE(tab);
EXPECT_TRUE(tab->GetTabTitle(&title));
- EXPECT_EQ(L"Layout Test Plugin Test", title);
+ EXPECT_EQ(ASCIIToUTF16("Layout Test Plugin Test"), title);
ASSERT_TRUE(tab->GoBack());
EXPECT_TRUE(tab->GetTabTitle(&title));
- EXPECT_EQ(L"", title);
+ EXPECT_EQ(string16(), title);
}
// Tests if a plugin executing a self deleting script using NPN_GetURL

Powered by Google App Engine
This is Rietveld 408576698