| Index: content/test/test_web_contents.cc
|
| diff --git a/content/test/test_web_contents.cc b/content/test/test_web_contents.cc
|
| index 4a4ad0494801707d7b252624e0ddfbd98ffd21ec..33332bdd87e192e3b14f26b9d86ffecba8d1b187 100644
|
| --- a/content/test/test_web_contents.cc
|
| +++ b/content/test/test_web_contents.cc
|
| @@ -94,7 +94,7 @@ bool TestWebContents::CreateRenderViewForRenderManager(
|
| RenderViewHost* render_view_host, int opener_route_id) {
|
| // This will go to a TestRenderViewHost.
|
| static_cast<RenderViewHostImpl*>(
|
| - render_view_host)->CreateRenderView(string16(),
|
| + render_view_host)->CreateRenderView(base::string16(),
|
| opener_route_id,
|
| -1);
|
| return true;
|
| @@ -212,7 +212,7 @@ void TestWebContents::TestDidFailLoadWithError(
|
| const GURL& url,
|
| bool is_main_frame,
|
| int error_code,
|
| - const string16& error_description) {
|
| + const base::string16& error_description) {
|
| ViewHostMsg_DidFailLoadWithError msg(
|
| 0, frame_id, url, is_main_frame, error_code, error_description);
|
| OnMessageReceived(GetRenderViewHost(), msg);
|
|
|