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

webkit/plugins/ppapi/ppapi_plugin_instance.cc

Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc
===================================================================
--- webkit/plugins/ppapi/ppapi_plugin_instance.cc	(revision 113301)
+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc	(working copy)
@@ -34,10 +34,10 @@
 #include "ppapi/c/ppp_mouse_lock.h"
 #include "ppapi/c/private/ppb_instance_private.h"
 #include "ppapi/c/private/ppp_instance_private.h"
-#include "ppapi/shared_impl/ppb_input_event_shared.h"
-#include "ppapi/shared_impl/ppb_url_util_shared.h"
+#include "ppapi/shared_impl/input_event_impl.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/time_conversion.h"
+#include "ppapi/shared_impl/url_util_impl.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_buffer_api.h"
@@ -101,7 +101,7 @@
 
 using base::StringPrintf;
 using ppapi::InputEventData;
-using ppapi::PPB_InputEvent_Shared;
+using ppapi::InputEventImpl;
 using ppapi::PpapiGlobals;
 using ppapi::StringVar;
 using ppapi::thunk::EnterResourceNoLock;
@@ -588,9 +588,9 @@
     event.is_filtered = true;
   else
     handled = true; // Unfiltered events are assumed to be handled.
-  scoped_refptr<PPB_InputEvent_Shared> event_resource(
-      new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsImpl(),
-                                pp_instance(), event));
+  scoped_refptr<InputEventImpl> event_resource(
+      new InputEventImpl(InputEventImpl::InitAsImpl(),
+                         pp_instance(), event));
   handled |= PP_ToBool(plugin_input_event_interface_->HandleInputEvent(
       pp_instance(), event_resource->pp_resource()));
   return handled;
@@ -687,9 +687,9 @@
           events[i].is_filtered = true;
         else
           rv = true;  // Unfiltered events are assumed to be handled.
-        scoped_refptr<PPB_InputEvent_Shared> event_resource(
-            new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsImpl(),
-                                      pp_instance(), events[i]));
+        scoped_refptr<InputEventImpl> event_resource(
+            new InputEventImpl(InputEventImpl::InitAsImpl(),
+                               pp_instance(), events[i]));
 
         rv |= PP_ToBool(plugin_input_event_interface_->HandleInputEvent(
             pp_instance(), event_resource->pp_resource()));
@@ -1895,7 +1895,7 @@
 
   WebElement plugin_element = container()->element();
   GURL document_url = plugin_element.document().baseURL();
-  return ::ppapi::PPB_URLUtil_Shared::GenerateURLReturn(
+  return ::ppapi::URLUtilImpl::GenerateURLReturn(
       module()->pp_module(),
       document_url.Resolve(relative_string->value()),
       components);
@@ -1933,16 +1933,15 @@
 PP_Var PluginInstance::GetDocumentURL(PP_Instance instance,
                                       PP_URLComponents_Dev* components) {
   WebKit::WebDocument document = container()->element().document();
-  return ::ppapi::PPB_URLUtil_Shared::GenerateURLReturn(
-      module()->pp_module(), document.url(), components);
+  return ::ppapi::URLUtilImpl::GenerateURLReturn(module()->pp_module(),
+                                                 document.url(), components);
 }
 
 PP_Var PluginInstance::GetPluginInstanceURL(
     PP_Instance instance,
     PP_URLComponents_Dev* components) {
-  return ::ppapi::PPB_URLUtil_Shared::GenerateURLReturn(module()->pp_module(),
-                                                        plugin_url_,
-                                                        components);
+  return ::ppapi::URLUtilImpl::GenerateURLReturn(module()->pp_module(),
+                                                 plugin_url_, components);
 }
 
 void PluginInstance::DoSetCursor(WebCursorInfo* cursor) {
Property changes on: webkit/plugins/ppapi/ppapi_plugin_instance.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppapi_plugin_instance.cc:r3734-4217,4606-5108,5177-5263