Convert string16 to base::string16 in content.

content/plugin/webplugin_delegate_stub.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/plugin/webplugin_delegate_stub.h"
 
 #include "build/build_config.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 299 matching lines @@
   // been released, or if the channel to the proxy is closed.
   NPObjectStub* scriptable_stub = new NPObjectStub(
       object, channel_.get(), *route_id,
       webplugin_->host_render_view_routing_id(), page_url_);
   plugin_scriptable_object_ = scriptable_stub->AsWeakPtr();
 
   // Release ref added by GetPluginScriptableObject (our stub holds its own).
   WebBindings::releaseObject(object);
 }
 
-void WebPluginDelegateStub::OnGetFormValue(string16* value, bool* success) {
+void WebPluginDelegateStub::OnGetFormValue(base::string16* value,
+                                           bool* success) {
   *success = false;
   if (!delegate_)
     return;
   *success = delegate_->GetFormValue(value);
 }
 
 void WebPluginDelegateStub::OnSendJavaScriptStream(const GURL& url,
                                                    const std::string& result,
                                                    bool success,
                                                    int notify_id) {
   delegate_->SendJavaScriptStream(url, result, success, notify_id);
 }
 
 void WebPluginDelegateStub::OnSetContentAreaFocus(bool has_focus) {
   if (delegate_)
     delegate_->SetContentAreaHasFocus(has_focus);
 }
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 void WebPluginDelegateStub::OnImeCompositionUpdated(
-    const string16& text,
+    const base::string16& text,
     const std::vector<int>& clauses,
     const std::vector<int>& target,
     int cursor_position) {
   if (delegate_)
     delegate_->ImeCompositionUpdated(text, clauses, target, cursor_position);
 #if defined(OS_WIN) && !defined(USE_AURA)
   webplugin_->UpdateIMEStatus();
 #endif
 }
 
-void WebPluginDelegateStub::OnImeCompositionCompleted(const string16& text) {
+void WebPluginDelegateStub::OnImeCompositionCompleted(
+    const base::string16& text) {
   if (delegate_)
     delegate_->ImeCompositionCompleted(text);
 }
 #endif
 
 #if defined(OS_MACOSX)
 void WebPluginDelegateStub::OnSetWindowFocus(bool has_focus) {
   if (delegate_)
     delegate_->SetWindowHasFocus(has_focus);
 }
@@ skipping 12 matching lines @@
     delegate_->SetWindowHasFocus(has_focus);
   }
 }
 
 void WebPluginDelegateStub::OnWindowFrameChanged(const gfx::Rect& window_frame,
                                                  const gfx::Rect& view_frame) {
   if (delegate_)
     delegate_->WindowFrameChanged(window_frame, view_frame);
 }
 
-void WebPluginDelegateStub::OnImeCompositionCompleted(const string16& text) {
+void WebPluginDelegateStub::OnImeCompositionCompleted(
+    const base::string16& text) {
   if (delegate_)
     delegate_->ImeCompositionCompleted(text);
 }
 #endif  // OS_MACOSX
 
 void WebPluginDelegateStub::OnDidReceiveManualResponse(
     const GURL& url,
     const PluginMsg_DidReceiveResponseParams& params) {
   delegate_->DidReceiveManualResponse(url, params.mime_type, params.headers,
                                       params.expected_length,
@@ skipping 42 matching lines @@
                       data,
                       static_cast<unsigned int>(params.post_data.size()),
                       params.referrer,
                       params.notify_redirect,
                       params.is_plugin_src_load,
                       channel_->renderer_id(),
                       params.render_view_id);
 }
 
 }  // namespace content