Convert string16 to base::string16 in content.

content/browser/media/media_internals_proxy.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/media_internals_proxy.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "content/browser/media/media_internals_handler.h"
 #include "content/public/browser/content_browser_client.h"
@@ skipping 51 matching lines @@
 
   // Ask MediaInternals for all its data.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&MediaInternalsProxy::GetEverythingOnIOThread, this));
 
   // Send the page names for constants.
   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,
       base::Bind(&MediaInternalsProxy::UpdateUIOnUIThread, this, update));
 }
 
 void MediaInternalsProxy::OnAddEntry(const net::NetLog::Entry& entry) {
   bool is_event_interesting = false;
   for (size_t i = 0; i < arraysize(kNetEventTypeFilter); i++) {
     if (entry.type() == kNetEventTypeFilter[i]) {
@@ skipping 50 matching lines @@
     net::NetLog* net_log = GetContentClient()->browser()->GetNetLog();
     net_log->RemoveThreadSafeObserver(this);
   }
 }
 
 void MediaInternalsProxy::GetEverythingOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   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_)
     handler_->OnUpdate(update);
 }
 
 void MediaInternalsProxy::AddNetEventOnUIThread(base::Value* entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Send the updates to the page in kMediaInternalsProxyEventDelayMilliseconds
@@ skipping 14 matching lines @@
   CallJavaScriptFunctionOnUIThread("media.onNetUpdate",
                                    pending_net_updates_.release());
 }
 
 void MediaInternalsProxy::CallJavaScriptFunctionOnUIThread(
     const std::string& function, base::Value* args) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   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);
 }
 
 }  // namespace content