Reupload of http://codereview.chromium.org/6801053/

My repo got messed up.

BUG=None
TEST=src/ppapi/tests/test_post_message.cc
Review URL: http://codereview.chromium.org/6801053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80992 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 13 insertions, 13 deletions

diff --git a/webkit/plugins/ppapi/message_channel.h b/webkit/plugins/ppapi/message_channel.h
index efe4568..a6091f13 100644
--- a/webkit/plugins/ppapi/message_channel.h
+++ b/webkit/plugins/ppapi/message_channel.h
@@ -18,7 +18,7 @@ class PluginInstance;
 
 // MessageChannel implements bidirectional postMessage functionality, allowing
 // calls from JavaScript to plugins and vice-versa. See
-// PPB_Instance::PostMessage and PPP_Instance::HandleMessage for more
+// PPB_Messaging::PostMessage and PPP_Messaging::HandleMessage for more
 // information.
 //
 // Currently, only 1 MessageChannel can exist, to implement postMessage
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 6a7c397..a166c14 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -27,7 +27,6 @@
 #include "ppapi/c/dev/ppb_fullscreen_dev.h"
 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"
 #include "ppapi/c/dev/ppb_graphics_3d_dev.h"
-#include "ppapi/c/dev/ppb_messaging_dev.h"
 #include "ppapi/c/dev/ppb_opengles_dev.h"
 #include "ppapi/c/dev/ppb_scrollbar_dev.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
@@ -44,6 +43,7 @@
 #include "ppapi/c/ppb_graphics_2d.h"
 #include "ppapi/c/ppb_image_data.h"
 #include "ppapi/c/ppb_instance.h"
+#include "ppapi/c/ppb_messaging.h"
 #include "ppapi/c/ppb_url_loader.h"
 #include "ppapi/c/ppb_url_request_info.h"
 #include "ppapi/c/ppb_url_response_info.h"
@@ -277,7 +277,7 @@ const void* GetInterface(const char* name) {
     return PPB_ImageData_Impl::GetTrustedInterface();
   if (strcmp(name, PPB_INSTANCE_INTERFACE) == 0)
     return PluginInstance::GetInterface();
-  if (strcmp(name, PPB_MESSAGING_DEV_INTERFACE) == 0)
+  if (strcmp(name, PPB_MESSAGING_INTERFACE) == 0)
     return PluginInstance::GetMessagingInterface();
   if (strcmp(name, PPB_PDF_INTERFACE) == 0)
     return PPB_PDF_Impl::GetInterface();
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index 265885c..fa5b9aa 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -11,10 +11,8 @@
 #include "base/utf_string_conversions.h"
 #include "ppapi/c/dev/ppb_find_dev.h"
 #include "ppapi/c/dev/ppb_fullscreen_dev.h"
-#include "ppapi/c/dev/ppb_messaging_dev.h"
 #include "ppapi/c/dev/ppb_zoom_dev.h"
 #include "ppapi/c/dev/ppp_find_dev.h"
-#include "ppapi/c/dev/ppp_messaging_dev.h"
 #include "ppapi/c/dev/ppp_selection_dev.h"
 #include "ppapi/c/dev/ppp_zoom_dev.h"
 #include "ppapi/c/pp_input_event.h"
@@ -24,7 +22,9 @@
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/ppb_instance.h"
+#include "ppapi/c/ppb_messaging.h"
 #include "ppapi/c/ppp_instance.h"
+#include "ppapi/c/ppp_messaging.h"
 #include "printing/units.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
@@ -281,7 +281,7 @@ void PostMessage(PP_Instance instance_id, PP_Var message) {
   instance->PostMessage(message);
 }
 
-const PPB_Messaging_Dev ppb_messaging = {
+const PPB_Messaging ppb_messaging = {
   &PostMessage
 };
 
@@ -403,7 +403,7 @@ const PPB_Fullscreen_Dev* PluginInstance::GetFullscreenInterface() {
 }
 
 // static
-const PPB_Messaging_Dev* PluginInstance::GetMessagingInterface() {
+const PPB_Messaging* PluginInstance::GetMessagingInterface() {
   return &ppb_messaging;
 }
 
@@ -921,8 +921,8 @@ bool PluginInstance::LoadMessagingInterface() {
   if (!checked_for_plugin_messaging_interface_) {
     checked_for_plugin_messaging_interface_ = true;
     plugin_messaging_interface_ =
-        reinterpret_cast<const PPP_Messaging_Dev*>(module_->GetPluginInterface(
-            PPP_MESSAGING_DEV_INTERFACE));
+        reinterpret_cast<const PPP_Messaging*>(module_->GetPluginInterface(
+            PPP_MESSAGING_INTERFACE));
   }
 
   return !!plugin_messaging_interface_;
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h
index 837a179..35968bb 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -30,11 +30,11 @@ struct PP_Var;
 struct PPB_Instance;
 struct PPB_Find_Dev;
 struct PPB_Fullscreen_Dev;
-struct PPB_Messaging_Dev;
+struct PPB_Messaging;
 struct PPB_Zoom_Dev;
 struct PPP_Find_Dev;
 struct PPP_Instance;
-struct PPP_Messaging_Dev;
+struct PPP_Messaging;
 struct PPP_Pdf;
 struct PPP_Selection_Dev;
 struct PPP_Zoom_Dev;
@@ -87,7 +87,7 @@ class PluginInstance : public base::RefCounted<PluginInstance> {
   // exposed to the plugin.
   static const PPB_Find_Dev* GetFindInterface();
   static const PPB_Fullscreen_Dev* GetFullscreenInterface();
-  static const PPB_Messaging_Dev* GetMessagingInterface();
+  static const PPB_Messaging* GetMessagingInterface();
   static const PPB_Zoom_Dev* GetZoomInterface();
 
   PluginDelegate* delegate() const { return delegate_; }
@@ -345,7 +345,7 @@ class PluginInstance : public base::RefCounted<PluginInstance> {
 
   // The plugin-provided interfaces.
   const PPP_Find_Dev* plugin_find_interface_;
-  const PPP_Messaging_Dev* plugin_messaging_interface_;
+  const PPP_Messaging* plugin_messaging_interface_;
   const PPP_Pdf* plugin_pdf_interface_;
   const PPP_Selection_Dev* plugin_selection_interface_;
   const PPP_Zoom_Dev* plugin_zoom_interface_;