Replace string16 with base::string16 in src/webkit

webkit/plugins/npapi/webplugin_delegate_impl_win.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 "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 185 matching lines @@
 
   int major_version = 0;
   if (plugin_version.IsValid())
     major_version = plugin_version.components()[0];
 
   return major_version;
 }
 
 bool GetPluginPropertyFromWindow(
     HWND window, const wchar_t* plugin_atom_property,
-    string16* plugin_property) {
+    base::string16* plugin_property) {
   ATOM plugin_atom = reinterpret_cast<ATOM>(
       GetPropW(window, plugin_atom_property));
   if (plugin_atom != 0) {
     WCHAR plugin_property_local[MAX_PATH] = {0};
     GlobalGetAtomNameW(plugin_atom,
                        plugin_property_local,
                        ARRAYSIZE(plugin_property_local));
     *plugin_property = plugin_property_local;
     return true;
   }
   return false;
 }
 
 }  // namespace
 
 bool WebPluginDelegateImpl::IsPluginDelegateWindow(HWND window) {
-  return ui::GetClassName(window) == string16(kNativeWindowClassName);
+  return ui::GetClassName(window) == base::string16(kNativeWindowClassName);
 }
 
 // static
 bool WebPluginDelegateImpl::GetPluginNameFromWindow(
-    HWND window, string16* plugin_name) {
+    HWND window, base::string16* plugin_name) {
   return IsPluginDelegateWindow(window) &&
       GetPluginPropertyFromWindow(
           window, kPluginNameAtomProperty, plugin_name);
 }
 
 // static
 bool WebPluginDelegateImpl::GetPluginVersionFromWindow(
-    HWND window, string16* plugin_version) {
+    HWND window, base::string16* plugin_version) {
   return IsPluginDelegateWindow(window) &&
       GetPluginPropertyFromWindow(
           window, kPluginVersionAtomProperty, plugin_version);
 }
 
 bool WebPluginDelegateImpl::IsDummyActivationWindow(HWND window) {
   if (!IsWindow(window))
     return false;
 
   wchar_t window_title[MAX_PATH + 1] = {0};
@@ skipping 306 matching lines @@
       std::wstring plugin_name = plugin_lib->plugin_info().name;
       if (!plugin_name.empty()) {
         ATOM plugin_name_atom = GlobalAddAtomW(plugin_name.c_str());
         DCHECK_NE(0, plugin_name_atom);
         result = SetProp(windowed_handle_,
             kPluginNameAtomProperty,
             reinterpret_cast<HANDLE>(plugin_name_atom));
         DCHECK(result == TRUE) << "SetProp failed, last error = " <<
             GetLastError();
       }
-      string16 plugin_version = plugin_lib->plugin_info().version;
+      base::string16 plugin_version = plugin_lib->plugin_info().version;
       if (!plugin_version.empty()) {
         ATOM plugin_version_atom = GlobalAddAtomW(plugin_version.c_str());
         DCHECK_NE(0, plugin_version_atom);
         result = SetProp(windowed_handle_,
             kPluginVersionAtomProperty,
             reinterpret_cast<HANDLE>(plugin_version_atom));
         DCHECK(result == TRUE) << "SetProp failed, last error = " <<
             GetLastError();
       }
     }
@@ skipping 896 matching lines @@
     static const wchar_t kChromeExeName[] = L"chrome.exe";
     wcsncpy_s(name, orig_size, kChromeExeName, arraysize(kChromeExeName));
     *name_size =
         std::min(orig_size, static_cast<DWORD>(arraysize(kChromeExeName)));
   }
 
   return rv;
 }
 
 void WebPluginDelegateImpl::ImeCompositionUpdated(
-    const string16& text,
+    const base::string16& text,
     const std::vector<int>& clauses,
     const std::vector<int>& target,
     int cursor_position) {
   if (!plugin_ime_.get())
     plugin_ime_.reset(new WebPluginIMEWin);
 
   plugin_ime_->CompositionUpdated(text, clauses, target, cursor_position);
   plugin_ime_->SendEvents(instance());
 }
 
-void WebPluginDelegateImpl::ImeCompositionCompleted(const string16& text) {
+void WebPluginDelegateImpl::ImeCompositionCompleted(
+    const base::string16& text) {
   if (!plugin_ime_.get())
     plugin_ime_.reset(new WebPluginIMEWin);
   plugin_ime_->CompositionCompleted(text);
   plugin_ime_->SendEvents(instance());
 }
 
 bool WebPluginDelegateImpl::GetIMEStatus(int* input_type,
                                          gfx::Rect* caret_rect) {
   if (!plugin_ime_.get())
     return false;
@@ skipping 33 matching lines @@
       ::ReleaseCapture();
       break;
 
     default:
       break;
   }
 }
 
 }  // namespace npapi
 }  // namespace webkit