Convert string16 to base::string16 in content.

BUG=

Review URL: https://codereview.chromium.org/102593002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238447 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 21 insertions, 21 deletions

diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
index 215b3e7..0655823 100644
--- a/content/browser/media/media_browsertest.cc
+++ b/content/browser/media/media_browsertest.cc
@@ -59,13 +59,13 @@ void MediaBrowserTest::RunMediaTestPage(
 }
 
 void MediaBrowserTest::RunTest(const GURL& gurl, const char* expected) {
-  const string16 expected_title = ASCIIToUTF16(expected);
+  const base::string16 expected_title = ASCIIToUTF16(expected);
   DVLOG(1) << "Running test URL: " << gurl;
   TitleWatcher title_watcher(shell()->web_contents(), expected_title);
   AddWaitForTitles(&title_watcher);
   NavigateToURL(shell(), gurl);
 
-  string16 final_title = title_watcher.WaitAndGetTitle();
+  base::string16 final_title = title_watcher.WaitAndGetTitle();
   EXPECT_EQ(expected_title, final_title);
 }
 
diff --git a/content/browser/media/media_internals.cc b/content/browser/media/media_internals.cc
index 1e0538e..1ee42d1 100644
--- a/content/browser/media/media_internals.cc
+++ b/content/browser/media/media_internals.cc
@@ -17,8 +17,8 @@ namespace {
 static base::LazyInstance<content::MediaInternals>::Leaky g_media_internals =
     LAZY_INSTANCE_INITIALIZER;
 
-string16 SerializeUpdate(const std::string& function,
-                         const base::Value* value) {
+base::string16 SerializeUpdate(const std::string& function,
+                               const base::Value* value) {
   return content::WebUI::GetJavascriptCall(
       function, std::vector<const base::Value*>(1, value));
 }
@@ -185,7 +185,7 @@ void MediaInternals::RemoveUpdateCallback(const UpdateCallback& callback) {
 }
 
 void MediaInternals::SendEverything() {
-  string16 everything_update;
+  base::string16 everything_update;
   {
     base::AutoLock auto_lock(lock_);
     everything_update = SerializeUpdate(
@@ -194,7 +194,7 @@ void MediaInternals::SendEverything() {
   SendUpdate(everything_update);
 }
 
-void MediaInternals::SendUpdate(const string16& update) {
+void MediaInternals::SendUpdate(const base::string16& update) {
   // SendUpdate() may be called from any thread, but must run on the IO thread.
   // TODO(dalecurtis): This is pretty silly since the update callbacks simply
   // forward the calls to the UI thread.  We should avoid the extra hop.
diff --git a/content/browser/media/media_internals.h b/content/browser/media/media_internals.h
index 8a179e0..c0f144a 100644
--- a/content/browser/media/media_internals.h
+++ b/content/browser/media/media_internals.h
@@ -37,7 +37,7 @@ class CONTENT_EXPORT MediaInternals
                      const std::vector<media::MediaLogEvent>& events);
 
   // Called with the update string.
-  typedef base::Callback<void(const string16&)> UpdateCallback;
+  typedef base::Callback<void(const base::string16&)> UpdateCallback;
 
   // Add/remove update callbacks (see above).  Must be called on the IO thread.
   void AddUpdateCallback(const UpdateCallback& callback);
@@ -59,7 +59,7 @@ class CONTENT_EXPORT MediaInternals
 
   // Sends |update| to each registered UpdateCallback.  Safe to call from any
   // thread, but will forward to the IO thread.
-  void SendUpdate(const string16& update);
+  void SendUpdate(const base::string16& update);
 
   // Caches |value| under |cache_key| so that future SendEverything() calls will
   // include the current data.  Calls JavaScript |function|(|value|) for each
diff --git a/content/browser/media/media_internals_handler.cc b/content/browser/media/media_internals_handler.cc
index a45dd4f..9a3e7be 100644
--- a/content/browser/media/media_internals_handler.cc
+++ b/content/browser/media/media_internals_handler.cc
@@ -38,12 +38,12 @@ void MediaInternalsMessageHandler::OnGetEverything(
   proxy_->GetEverything();
 }
 
-void MediaInternalsMessageHandler::OnUpdate(const string16& update) {
+void MediaInternalsMessageHandler::OnUpdate(const base::string16& update) {
   // Don't try to execute JavaScript in a RenderView that no longer exists nor
   // if the chrome://media-internals page hasn't finished loading.
   RenderViewHost* host = web_ui()->GetWebContents()->GetRenderViewHost();
   if (host && page_load_complete_)
-    host->ExecuteJavascriptInWebFrame(string16(), update);
+    host->ExecuteJavascriptInWebFrame(base::string16(), update);
 }
 
 }  // namespace content
diff --git a/content/browser/media/media_internals_handler.h b/content/browser/media/media_internals_handler.h
index 8ea6f88..265c122 100644
--- a/content/browser/media/media_internals_handler.h
+++ b/content/browser/media/media_internals_handler.h
@@ -30,7 +30,7 @@ class MediaInternalsMessageHandler : public WebUIMessageHandler {
   void OnGetEverything(const base::ListValue* list);
 
   // MediaInternals message handlers.
-  void OnUpdate(const string16& update);
+  void OnUpdate(const base::string16& update);
 
  private:
   scoped_refptr<MediaInternalsProxy> proxy_;
diff --git a/content/browser/media/media_internals_proxy.cc b/content/browser/media/media_internals_proxy.cc
index d0e0622..49456ab 100644
--- a/content/browser/media/media_internals_proxy.cc
+++ b/content/browser/media/media_internals_proxy.cc
@@ -69,7 +69,7 @@ void MediaInternalsProxy::GetEverything() {
   CallJavaScriptFunctionOnUIThread("media.onReceiveConstants", GetConstants());
 }
 
-void MediaInternalsProxy::OnUpdate(const string16& update) {
+void MediaInternalsProxy::OnUpdate(const base::string16& update) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
@@ -140,7 +140,7 @@ void MediaInternalsProxy::GetEverythingOnIOThread() {
   MediaInternals::GetInstance()->SendEverything();
 }
 
-void MediaInternalsProxy::UpdateUIOnUIThread(const string16& update) {
+void MediaInternalsProxy::UpdateUIOnUIThread(const base::string16& update) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Don't forward updates to a destructed UI.
   if (handler_)
@@ -175,7 +175,7 @@ void MediaInternalsProxy::CallJavaScriptFunctionOnUIThread(
   scoped_ptr<base::Value> args_value(args);
   std::vector<const base::Value*> args_vector;
   args_vector.push_back(args_value.get());
-  string16 update = WebUI::GetJavascriptCall(function, args_vector);
+  base::string16 update = WebUI::GetJavascriptCall(function, args_vector);
   UpdateUIOnUIThread(update);
 }
 
diff --git a/content/browser/media/media_internals_proxy.h b/content/browser/media/media_internals_proxy.h
index 5d173b3..b737b85 100644
--- a/content/browser/media/media_internals_proxy.h
+++ b/content/browser/media/media_internals_proxy.h
@@ -49,7 +49,7 @@ class MediaInternalsProxy
   void GetEverything();
 
   // MediaInternals callback. Called on the IO thread.
-  void OnUpdate(const string16& update);
+  void OnUpdate(const base::string16& update);
 
   // net::NetLog::ThreadSafeObserver implementation. Callable from any thread:
   virtual void OnAddEntry(const net::NetLog::Entry& entry) OVERRIDE;
@@ -65,7 +65,7 @@ class MediaInternalsProxy
   void ObserveMediaInternalsOnIOThread();
   void StopObservingMediaInternalsOnIOThread();
   void GetEverythingOnIOThread();
-  void UpdateUIOnUIThread(const string16& update);
+  void UpdateUIOnUIThread(const base::string16& update);
 
   // Put |entry| on a list of events to be sent to the page.
   void AddNetEventOnUIThread(base::Value* entry);
diff --git a/content/browser/media/media_internals_unittest.cc b/content/browser/media/media_internals_unittest.cc
index e16124b..2947104 100644
--- a/content/browser/media/media_internals_unittest.cc
+++ b/content/browser/media/media_internals_unittest.cc
@@ -45,7 +45,7 @@ class MediaInternalsTest
 
  protected:
   // Extracts and deserializes the JSON update data; merges into |update_data_|.
-  void UpdateCallbackImpl(const string16& update) {
+  void UpdateCallbackImpl(const base::string16& update) {
     // Each update string looks like "<JavaScript Function Name>({<JSON>});", to
     // use the JSON reader we need to strip out the JavaScript code.
     std::string utf8_update = base::UTF16ToUTF8(update);
diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc
index bfb96e1..e63207d 100644
--- a/content/browser/media/webrtc_browsertest.cc
+++ b/content/browser/media/webrtc_browsertest.cc
@@ -130,7 +130,7 @@ class WebrtcBrowserTest: public ContentBrowserTest {
   }
 
   void ExpectTitle(const std::string& expected_title) const {
-    string16 expected_title16(ASCIIToUTF16(expected_title));
+    base::string16 expected_title16(ASCIIToUTF16(expected_title));
     TitleWatcher title_watcher(shell()->web_contents(), expected_title16);
     EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
   }
diff --git a/content/browser/media/webrtc_internals_browsertest.cc b/content/browser/media/webrtc_internals_browsertest.cc
index b458276..0d279b3 100644
--- a/content/browser/media/webrtc_internals_browsertest.cc
+++ b/content/browser/media/webrtc_internals_browsertest.cc
@@ -145,7 +145,7 @@ class MAYBE_WebRTCInternalsBrowserTest: public ContentBrowserTest {
   }
 
   void ExpectTitle(const std::string& expected_title) const {
-    string16 expected_title16(ASCIIToUTF16(expected_title));
+    base::string16 expected_title16(ASCIIToUTF16(expected_title));
     TitleWatcher title_watcher(shell()->web_contents(), expected_title16);
     EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
   }
diff --git a/content/browser/media/webrtc_internals_message_handler.cc b/content/browser/media/webrtc_internals_message_handler.cc
index 2ba7522..8cf8579 100644
--- a/content/browser/media/webrtc_internals_message_handler.cc
+++ b/content/browser/media/webrtc_internals_message_handler.cc
@@ -68,11 +68,11 @@ void WebRTCInternalsMessageHandler::OnUpdate(const std::string& command,
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   std::vector<const base::Value*> args_vector;
   args_vector.push_back(args);
-  string16 update = WebUI::GetJavascriptCall(command, args_vector);
+  base::string16 update = WebUI::GetJavascriptCall(command, args_vector);
 
   RenderViewHost* host = web_ui()->GetWebContents()->GetRenderViewHost();
   if (host)
-    host->ExecuteJavascriptInWebFrame(string16(), update);
+    host->ExecuteJavascriptInWebFrame(base::string16(), update);
 }
 
 }  // namespace content