| 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
|
|
|