Replace string16 with base::string16 in src/webkit

webkit/plugins/ppapi/ppapi_plugin_instance.h

Index: webkit/plugins/ppapi/ppapi_plugin_instance.h
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h
index 0b906a6b077b55ad5c5fc47ffc8343450e2a8762..de8f6e0e553a66b1a7dbcbb0fd0a6cfdab70ca9d 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -14,7 +14,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/string16.h"
+#include "base/string16.h.h"
 #include "cc/layers/texture_layer_client.h"
 #include "googleurl/src/gurl.h"
 #include "ppapi/c/dev/pp_cursor_type_dev.h"
@@ -185,20 +185,20 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
                    const std::vector<gfx::Rect>& cut_outs_rects);
 
   // Handlers for composition events.
-  bool HandleCompositionStart(const string16& text);
+  bool HandleCompositionStart(const base::string16& text);
   bool HandleCompositionUpdate(
-      const string16& text,
+      const base::string16& text,
       const std::vector<WebKit::WebCompositionUnderline>& underlines,
       int selection_start,
       int selection_end);
-  bool HandleCompositionEnd(const string16& text);
-  bool HandleTextInput(const string16& text);
+  bool HandleCompositionEnd(const base::string16& text);
+  bool HandleTextInput(const base::string16& text);
 
   // Gets the current text input status.
   ui::TextInputType text_input_type() const { return text_input_type_; }
   gfx::Rect GetCaretBounds() const;
   bool IsPluginAcceptingCompositionEvents() const;
-  void GetSurroundingText(string16* text, ui::Range* range) const;
+  void GetSurroundingText(base::string16* text, ui::Range* range) const;
 
   // Notifications about focus changes, see has_webkit_focus_ below.
   void SetWebKitFocus(bool has_focus);
@@ -229,11 +229,11 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
   void AddPluginObject(PluginObject* plugin_object);
   void RemovePluginObject(PluginObject* plugin_object);
 
-  string16 GetSelectedText(bool html);
-  string16 GetLinkAtPosition(const gfx::Point& point);
+  base::string16 GetSelectedText(bool html);
+  base::string16 GetLinkAtPosition(const gfx::Point& point);
   void RequestSurroundingText(size_t desired_number_of_characters);
   void Zoom(double factor, bool text_only);
-  bool StartFind(const string16& search_text,
+  bool StartFind(const base::string16& search_text,
                  bool case_sensitive,
                  int identifier);
   void SelectFindResult(bool forward);
@@ -565,10 +565,10 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
   // Internal helper functions for HandleCompositionXXX().
   bool SendCompositionEventToPlugin(
       PP_InputEvent_Type type,
-      const string16& text);
+      const base::string16& text);
   bool SendCompositionEventWithUnderlineInformationToPlugin(
       PP_InputEvent_Type type,
-      const string16& text,
+      const base::string16& text,
       const std::vector<WebKit::WebCompositionUnderline>& underlines,
       int selection_start,
       int selection_end);