12 files changed, 23 insertions, 21 deletions
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
index 3894421..5a87327 100644
--- a/content/public/test/browser_test_utils.cc
+++ b/content/public/test/browser_test_utils.cc
@@ -539,21 +539,21 @@ bool SetCookie(BrowserContext* browser_context,
 }
 
 TitleWatcher::TitleWatcher(WebContents* web_contents,
-                           const string16& expected_title)
+                           const base::string16& expected_title)
     : WebContentsObserver(web_contents),
       message_loop_runner_(new MessageLoopRunner) {
   EXPECT_TRUE(web_contents != NULL);
   expected_titles_.push_back(expected_title);
 }
 
-void TitleWatcher::AlsoWaitForTitle(const string16& expected_title) {
+void TitleWatcher::AlsoWaitForTitle(const base::string16& expected_title) {
   expected_titles_.push_back(expected_title);
 }
 
 TitleWatcher::~TitleWatcher() {
 }
 
-const string16& TitleWatcher::WaitAndGetTitle() {
+const base::string16& TitleWatcher::WaitAndGetTitle() {
   message_loop_runner_->Run();
   return observed_title_;
 }
@@ -571,7 +571,7 @@ void TitleWatcher::TitleWasSet(NavigationEntry* entry, bool explicit_set) {
 }
 
 void TitleWatcher::TestTitle() {
-  std::vector<string16>::const_iterator it =
+  std::vector<base::string16>::const_iterator it =
       std::find(expected_titles_.begin(),
                 expected_titles_.end(),
                 web_contents()->GetTitle());
diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h
index 53b40ec..510e809 100644
--- a/content/public/test/browser_test_utils.h
+++ b/content/public/test/browser_test_utils.h
@@ -196,16 +196,16 @@ class TitleWatcher : public WebContentsObserver {
   // entire lifetime of |this|. |expected_title| is the title that |this|
   // will wait for.
   TitleWatcher(WebContents* web_contents,
-               const string16& expected_title);
+               const base::string16& expected_title);
   virtual ~TitleWatcher();
 
   // Adds another title to watch for.
-  void AlsoWaitForTitle(const string16& expected_title);
+  void AlsoWaitForTitle(const base::string16& expected_title);
 
   // Waits until the title matches either expected_title or one of the titles
   // added with AlsoWaitForTitle. Returns the value of the most recently
   // observed matching title.
-  const string16& WaitAndGetTitle() WARN_UNUSED_RESULT;
+  const base::string16& WaitAndGetTitle() WARN_UNUSED_RESULT;
 
  private:
   // Overridden WebContentsObserver methods.
@@ -214,11 +214,11 @@ class TitleWatcher : public WebContentsObserver {
 
   void TestTitle();
 
-  std::vector<string16> expected_titles_;
+  std::vector<base::string16> expected_titles_;
   scoped_refptr<MessageLoopRunner> message_loop_runner_;
 
   // The most recently observed expected title, if any.
-  string16 observed_title_;
+  base::string16 observed_title_;
 
   DISALLOW_COPY_AND_ASSIGN(TitleWatcher);
 };
diff --git a/content/public/test/fake_speech_recognition_manager.cc b/content/public/test/fake_speech_recognition_manager.cc
index 065fcb5..3d7b582 100644
--- a/content/public/test/fake_speech_recognition_manager.cc
+++ b/content/public/test/fake_speech_recognition_manager.cc
@@ -115,8 +115,8 @@ void FakeSpeechRecognitionManager::AbortAllSessionsForRenderView(
 
 bool FakeSpeechRecognitionManager::HasAudioInputDevices() { return true; }
 
-string16 FakeSpeechRecognitionManager::GetAudioInputDeviceModel() {
-  return string16();
+base::string16 FakeSpeechRecognitionManager::GetAudioInputDeviceModel() {
+  return base::string16();
 }
 
 int FakeSpeechRecognitionManager::GetSession(int render_process_id,
diff --git a/content/public/test/fake_speech_recognition_manager.h b/content/public/test/fake_speech_recognition_manager.h
index 0973f6c..c76340a 100644
--- a/content/public/test/fake_speech_recognition_manager.h
+++ b/content/public/test/fake_speech_recognition_manager.h
@@ -52,7 +52,7 @@ class FakeSpeechRecognitionManager : public SpeechRecognitionManager {
   virtual void AbortAllSessionsForRenderView(int render_process_id,
                                              int render_view_id) OVERRIDE;
   virtual bool HasAudioInputDevices() OVERRIDE;
-  virtual string16 GetAudioInputDeviceModel() OVERRIDE;
+  virtual base::string16 GetAudioInputDeviceModel() OVERRIDE;
   virtual void ShowAudioInputSettings() OVERRIDE {}
   virtual int GetSession(int render_process_id,
                          int render_view_id,
diff --git a/content/public/test/mock_render_process_host.cc b/content/public/test/mock_render_process_host.cc
index 21bcaf2..9ef67e3 100644
--- a/content/public/test/mock_render_process_host.cc
+++ b/content/public/test/mock_render_process_host.cc
@@ -111,7 +111,7 @@ StoragePartition* MockRenderProcessHost::GetStoragePartition() const {
   return NULL;
 }
 
-void MockRenderProcessHost::AddWord(const string16& word) {
+void MockRenderProcessHost::AddWord(const base::string16& word) {
 }
 
 bool MockRenderProcessHost::FastShutdownIfPossible() {
diff --git a/content/public/test/mock_render_process_host.h b/content/public/test/mock_render_process_host.h
index 3836ff5..daf9c81 100644
--- a/content/public/test/mock_render_process_host.h
+++ b/content/public/test/mock_render_process_host.h
@@ -50,7 +50,7 @@ class MockRenderProcessHost : public RenderProcessHost {
   virtual int VisibleWidgetCount() const OVERRIDE;
   virtual bool IsGuest() const OVERRIDE;
   virtual StoragePartition* GetStoragePartition() const OVERRIDE;
-  virtual void AddWord(const string16& word);
+  virtual void AddWord(const base::string16& word);
   virtual bool FastShutdownIfPossible() OVERRIDE;
   virtual bool FastShutdownStarted() const OVERRIDE;
   virtual void DumpHandles() OVERRIDE;
diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc
index 4862675..9da66ac 100644
--- a/content/public/test/mock_render_thread.cc
+++ b/content/public/test/mock_render_thread.cc
@@ -26,7 +26,7 @@ MockRenderThread::~MockRenderThread() {
 }
 
 void MockRenderThread::VerifyRunJavaScriptMessageSend(
-    const string16& expected_alert_message) {
+    const base::string16& expected_alert_message) {
   const IPC::Message* alert_msg =
       sink_.GetUniqueMessageMatching(ViewHostMsg_RunJavaScriptMessage::ID);
   ASSERT_TRUE(alert_msg);
diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h
index ec03c78..dc5b82a 100644
--- a/content/public/test/mock_render_thread.h
+++ b/content/public/test/mock_render_thread.h
@@ -35,7 +35,8 @@ class MockRenderThread : public RenderThread {
 
   // Helpers for embedders to know when content IPC messages are received, since
   // they don't have access to content IPC files.
-  void VerifyRunJavaScriptMessageSend(const string16& expected_alert_message);
+  void VerifyRunJavaScriptMessageSend(
+      const base::string16& expected_alert_message);
 
   // RenderThread implementation:
   virtual bool Send(IPC::Message* msg) OVERRIDE;
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index 2d96a85..64a4d2c 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
diff --git a/content/public/test/render_view_test.h b/content/public/test/render_view_test.h
index 6a5c2a1..204d023 100644
--- a/content/public/test/render_view_test.h
+++ b/content/public/test/render_view_test.h
@@ -66,7 +66,8 @@ class RenderViewTest : public testing::Test {
   // |result|.
   // Returns true if the JavaScript was evaluated correctly to an int value,
   // false otherwise.
-  bool ExecuteJavaScriptAndReturnIntValue(const string16& script, int* result);
+  bool ExecuteJavaScriptAndReturnIntValue(const base::string16& script,
+                                          int* result);
 
   // Loads the given HTML into the main frame as a data: URL and blocks until
   // the navigation is committed.
diff --git a/content/public/test/test_renderer_host.h b/content/public/test/test_renderer_host.h
index 69cfa8f..5eb5777 100644
--- a/content/public/test/test_renderer_host.h
+++ b/content/public/test/test_renderer_host.h
@@ -69,7 +69,7 @@ class RenderViewHostTester {
   virtual ~RenderViewHostTester() {}
 
   // Gives tests access to RenderViewHostImpl::CreateRenderView.
-  virtual bool CreateRenderView(const string16& frame_name,
+  virtual bool CreateRenderView(const base::string16& frame_name,
                                 int opener_route_id,
                                 int32 max_page_id) = 0;
 
diff --git a/content/public/test/test_utils.cc b/content/public/test/test_utils.cc
index 989437c..c417483 100644
--- a/content/public/test/test_utils.cc
+++ b/content/public/test/test_utils.cc
@@ -137,7 +137,7 @@ scoped_ptr<base::Value> ExecuteScriptAndGetValue(
   ScriptCallback observer;
 
   render_view_host->ExecuteJavascriptInWebFrameCallbackResult(
-      string16(),  // frame_xpath,
+      base::string16(),  // frame_xpath,
       UTF8ToUTF16(script),
       base::Bind(&ScriptCallback::ResultCallback, base::Unretained(&observer)));
   base::MessageLoop* loop = base::MessageLoop::current();