Revert 113290 - Rename the shared_impl resource files to give them more regular names.

webkit/plugins/ppapi/ppapi_plugin_instance.h

Index: webkit/plugins/ppapi/ppapi_plugin_instance.h
===================================================================
--- webkit/plugins/ppapi/ppapi_plugin_instance.h	(revision 113301)
+++ webkit/plugins/ppapi/ppapi_plugin_instance.h	(working copy)
@@ -26,7 +26,7 @@
 #include "ppapi/c/ppp_graphics_3d.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/shared_impl/function_group_base.h"
-#include "ppapi/shared_impl/ppb_instance_shared.h"
+#include "ppapi/shared_impl/instance_impl.h"
 #include "ppapi/shared_impl/ppp_instance_combined.h"
 #include "ppapi/thunk/ppb_instance_api.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -86,7 +86,7 @@
     public base::RefCounted<PluginInstance>,
     public ::ppapi::FunctionGroupBase,
     NON_EXPORTED_BASE(public ::ppapi::thunk::PPB_Instance_FunctionAPI),
-    public ::ppapi::PPB_Instance_Shared {
+    public ::ppapi::InstanceImpl {
  public:
   // Create and return a PluginInstance object which supports the
   // PPP_Instance_1_0 interface.
Property changes on: webkit/plugins/ppapi/ppapi_plugin_instance.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppapi_plugin_instance.h:r3734-4217,4606-5108,5177-5263