6 files changed, 8 insertions, 8 deletions
diff --git a/content/test/content_browser_test_test.cc b/content/test/content_browser_test_test.cc
index 8738a00..b9bf217 100644
--- a/content/test/content_browser_test_test.cc
+++ b/content/test/content_browser_test_test.cc
@@ -31,10 +31,10 @@ class ContentBrowserTestSanityTest : public ContentBrowserTest {
   void Test() {
     GURL url = GetTestUrl(".", "simple_page.html");
 
-    string16 expected_title(ASCIIToUTF16("OK"));
+    base::string16 expected_title(ASCIIToUTF16("OK"));
     TitleWatcher title_watcher(shell()->web_contents(), expected_title);
     NavigateToURL(shell(), url);
-    string16 title = title_watcher.WaitAndGetTitle();
+    base::string16 title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, title);
   }
 };
diff --git a/content/test/test_web_contents.cc b/content/test/test_web_contents.cc
index 4a4ad04..33332bd 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);
diff --git a/content/test/test_web_contents.h b/content/test/test_web_contents.h
index 7b308d8..5f338c6 100644
--- a/content/test/test_web_contents.h
+++ b/content/test/test_web_contents.h
@@ -97,7 +97,7 @@ class TestWebContents : public WebContentsImpl, public WebContentsTester {
                                 const GURL& url,
                                 bool is_main_frame,
                                 int error_code,
-                                const string16& error_description);
+                                const base::string16& error_description);
 
  protected:
   // The deprecated WebContentsTester still needs to subclass this.
diff --git a/content/test/test_web_contents_view.cc b/content/test/test_web_contents_view.cc
index 9bed145..793a77c 100644
--- a/content/test/test_web_contents_view.cc
+++ b/content/test/test_web_contents_view.cc
@@ -103,7 +103,7 @@ RenderWidgetHostView* TestWebContentsView::CreateViewForPopupWidget(
   return NULL;
 }
 
-void TestWebContentsView::SetPageTitle(const string16& title) {
+void TestWebContentsView::SetPageTitle(const base::string16& title) {
 }
 
 void TestWebContentsView::RenderViewCreated(RenderViewHost* host) {
diff --git a/content/test/test_web_contents_view.h b/content/test/test_web_contents_view.h
index 707b632..045f092 100644
--- a/content/test/test_web_contents_view.h
+++ b/content/test/test_web_contents_view.h
@@ -60,7 +60,7 @@ class TestWebContentsView : public WebContentsViewPort,
       RenderWidgetHost* render_widget_host) OVERRIDE;
   virtual RenderWidgetHostView* CreateViewForPopupWidget(
       RenderWidgetHost* render_widget_host) OVERRIDE;
-  virtual void SetPageTitle(const string16& title) OVERRIDE;
+  virtual void SetPageTitle(const base::string16& title) OVERRIDE;
   virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE;
   virtual void RenderViewSwappedIn(RenderViewHost* host) OVERRIDE;
   virtual void SetOverscrollControllerEnabled(bool enabled) OVERRIDE;
diff --git a/content/test/weburl_loader_mock_factory.cc b/content/test/weburl_loader_mock_factory.cc
index 2c91e6f..791ae1e 100644
--- a/content/test/weburl_loader_mock_factory.cc
+++ b/content/test/weburl_loader_mock_factory.cc
@@ -39,7 +39,7 @@ void WebURLLoaderMockFactory::RegisterURL(const WebURL& url,
     response_info.file_path =
         base::FilePath(static_cast<std::string>(file_path.utf8()));
 #elif defined(OS_WIN)
-    string16 file_path_16 = file_path;
+    base::string16 file_path_16 = file_path;
     response_info.file_path = base::FilePath(std::wstring(
         file_path_16.data(), file_path_16.length()));
 #endif