Convert string16 to base::string16 in content.

content/renderer/npapi/webplugin_delegate_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/renderer/npapi/webplugin_delegate_proxy.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #elif defined(USE_X11)
 #include <cairo/cairo.h>
@@ skipping 731 matching lines @@
       channel_host_.get(), route_id, 0, page_url_, GetPluginNPP());
 
   return WebBindings::retainObject(npobject_);
 }
 
 NPP WebPluginDelegateProxy::GetPluginNPP() {
   // Return a dummy NPP for WebKit to use to identify this plugin.
   return npp_.get();
 }
 
-bool WebPluginDelegateProxy::GetFormValue(string16* value) {
+bool WebPluginDelegateProxy::GetFormValue(base::string16* value) {
   bool success = false;
   Send(new PluginMsg_GetFormValue(instance_id_, value, &success));
   return success;
 }
 
 void WebPluginDelegateProxy::DidFinishLoadWithReason(
     const GURL& url, NPReason reason, int notify_id) {
   Send(new PluginMsg_DidFinishLoadWithReason(
       instance_id_, url, reason, notify_id));
 }
@@ skipping 30 matching lines @@
   IPC::Message* msg = new PluginMsg_SetContentAreaFocus(instance_id_,
                                                         has_focus);
   // Make sure focus events are delivered in the right order relative to
   // sync messages they might interact with (Paint, HandleEvent, etc.).
   msg->set_unblock(true);
   Send(msg);
 }
 
 #if defined(OS_WIN)
 void WebPluginDelegateProxy::ImeCompositionUpdated(
-    const string16& text,
+    const base::string16& text,
     const std::vector<int>& clauses,
     const std::vector<int>& target,
     int cursor_position,
     int plugin_id) {
   // Dispatch the raw IME data if this plug-in is the focused one.
   if (instance_id_ != plugin_id)
     return;
 
   IPC::Message* msg = new PluginMsg_ImeCompositionUpdated(instance_id_,
       text, clauses, target, cursor_position);
   msg->set_unblock(true);
   Send(msg);
 }
 
-void WebPluginDelegateProxy::ImeCompositionCompleted(const string16& text,
+void WebPluginDelegateProxy::ImeCompositionCompleted(const base::string16& text,
                                                      int plugin_id) {
   // Dispatch the IME text if this plug-in is the focused one.
   if (instance_id_ != plugin_id)
     return;
 
   IPC::Message* msg = new PluginMsg_ImeCompositionCompleted(instance_id_, text);
   msg->set_unblock(true);
   Send(msg);
 }
 #endif
@@ skipping 28 matching lines @@
 void WebPluginDelegateProxy::WindowFrameChanged(gfx::Rect window_frame,
                                                 gfx::Rect view_frame) {
   IPC::Message* msg = new PluginMsg_WindowFrameChanged(instance_id_,
                                                        window_frame,
                                                        view_frame);
   // Make sure frame events are delivered in the right order relative to
   // sync messages they might interact with (e.g., HandleEvent).
   msg->set_unblock(true);
   Send(msg);
 }
-void WebPluginDelegateProxy::ImeCompositionCompleted(const string16& text,
+void WebPluginDelegateProxy::ImeCompositionCompleted(const base::string16& text,
                                                      int plugin_id) {
   // If the message isn't intended for this plugin, there's nothing to do.
   if (instance_id_ != plugin_id)
     return;
 
   IPC::Message* msg = new PluginMsg_ImeCompositionCompleted(instance_id_,
                                                             text);
   // Order relative to other key events is important.
   msg->set_unblock(true);
   Send(msg);
@@ skipping 324 matching lines @@
   if (plugin_)
     plugin_->AcceleratedPluginSwappedIOSurface();
 }
 #endif
 
 #if defined(OS_WIN)
 bool WebPluginDelegateProxy::UseSynchronousGeometryUpdates() {
   // Need to update geometry synchronously with WMP, otherwise if a site
   // scripts the plugin to start playing while it's in the middle of handling
   // an update geometry message, videos don't play.  See urls in bug 20260.
-  if (info_.name.find(ASCIIToUTF16("Windows Media Player")) != string16::npos)
+  if (info_.name.find(ASCIIToUTF16("Windows Media Player")) !=
+      base::string16::npos)
     return true;
 
   // The move networks plugin needs to be informed of geometry updates
   // synchronously.
   std::vector<WebPluginMimeType>::iterator index;
   for (index = info_.mime_types.begin(); index != info_.mime_types.end();
        index++) {
     if (index->mime_type == "application/x-vnd.moveplayer.qm" ||
         index->mime_type == "application/x-vnd.moveplay2.qm" ||
         index->mime_type == "application/x-vnd.movenetworks.qm" ||
@@ skipping 12 matching lines @@
 
   plugin_->URLRedirectResponse(allow, resource_id);
 }
 
 void WebPluginDelegateProxy::OnCheckIfRunInsecureContent(const GURL& url,
                                                          bool* result) {
   *result = plugin_->CheckIfRunInsecureContent(url);
 }
 
 }  // namespace content