Replace string16 with base::string16 in src/webkit

webkit/plugins/npapi/webplugin_delegate_impl_mac.mm

 // 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 "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 #import <Cocoa/Cocoa.h>
 #import <QuartzCore/QuartzCore.h>
 #include <unistd.h>
 
@@ skipping 211 matching lines @@
 
         gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;
         // On dual GPU systems, force the use of the discrete GPU for
         // the CARenderer underlying our Core Animation backend for
         // all plugins except Flash. For some reason Unity3D's output
         // doesn't show up if the integrated GPU is used. Safari keeps
         // even Flash 11 with Stage3D on the integrated GPU, so mirror
         // that behavior here.
         const WebPluginInfo& plugin_info =
             instance_->plugin_lib()->plugin_info();
-        if (plugin_info.name.find(ASCIIToUTF16("Flash")) != string16::npos)
+        if (plugin_info.name.find(ASCIIToUTF16("Flash")) !=
+            base::string16::npos)
           gpu_preference = gfx::PreferIntegratedGpu;
         surface_ = plugin_->GetAcceleratedSurface(gpu_preference);
 
         // If surface initialization fails for some reason, just continue
         // without any drawing; returning false would be a more confusing user
         // experience (since it triggers a missing plugin placeholder).
         if (surface_ && surface_->context()) {
           renderer_ = [[CARenderer rendererWithCGLContext:surface_->context()
                                                   options:NULL] retain];
           [renderer_ setLayer:layer_];
@@ skipping 365 matching lines @@
   if (!clip_rect_.IsEmpty())
     instance()->webplugin()->InvalidateRect(gfx::Rect());
 }
 
 void WebPluginDelegateImpl::WindowFrameChanged(const gfx::Rect& window_frame,
                                                const gfx::Rect& view_frame) {
   instance()->set_window_frame(window_frame);
   SetContentAreaOrigin(gfx::Point(view_frame.x(), view_frame.y()));
 }
 
-void WebPluginDelegateImpl::ImeCompositionCompleted(const string16& text) {
+void WebPluginDelegateImpl::ImeCompositionCompleted(
+    const base::string16& text) {
   ime_enabled_ = false;
 
   // If |text| is empty this was just called to tell us composition was
   // cancelled externally (e.g., the user pressed esc).
   if (!text.empty()) {
     NPCocoaEvent text_event;
     memset(&text_event, 0, sizeof(NPCocoaEvent));
     text_event.type = NPCocoaEventTextInput;
     text_event.data.text.text =
         reinterpret_cast<NPNSString*>(base::SysUTF16ToNSString(text));
@@ skipping 90 matching lines @@
   [CATransaction commit];
 
   [renderer_ setBounds:[layer_ bounds]];
   surface_->SetSize(window_rect_.size());
   // Kick off the drawing timer, if necessary.
   PluginVisibilityChanged();
 }
 
 }  // namespace npapi
 }  // namespace webkit