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

Unified Diff: content/public/test/render_view_test.cc

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
« no previous file with comments | « content/public/test/render_view_test.h ('k') | content/public/test/test_renderer_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/render_view_test.cc
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index 2d96a85312d5b8cd8845fcabf04180037288fdf3..64a4d2c67ef9ba68db05a0d553dc3e634cc87123 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -91,7 +91,7 @@ void RenderViewTest::ExecuteJavaScript(const char* js) {
}
bool RenderViewTest::ExecuteJavaScriptAndReturnIntValue(
- const string16& script,
+ const base::string16& script,
int* int_result) {
v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
v8::Handle<v8::Value> result =
@@ -173,7 +173,7 @@ void RenderViewTest::SetUp() {
kMainFrameRouteId,
kSurfaceId,
kInvalidSessionStorageNamespaceId,
- string16(),
+ base::string16(),
false, // is_renderer_created
false, // swapped_out
false, // hidden
« no previous file with comments | « content/public/test/render_view_test.h ('k') | content/public/test/test_renderer_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698