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

1 files changed, 4 insertions, 4 deletions

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.