Rename PPB_Fullscreen_Dev to PPB_FlashFullscreen.

This is to make way for the new PPB_Fullscreen interface which will hopefully replace the old one at some point. This maintains backwards binary compat.

I renamed two things related to the broker because the file wasn't being included in the proxy properly, and we never noticed they were wrong.

This also fixes a crash in the test harness generating the list of tests, since there is no current test case for the DidChangeView call.
Review URL: http://codereview.chromium.org/7917019

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

5 files changed, 37 insertions, 36 deletions

diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
index 2ced0fd..afec017 100644
--- a/ppapi/proxy/interface_list.cc
+++ b/ppapi/proxy/interface_list.cc
@@ -41,6 +41,7 @@
 #include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/c/private/ppb_flash_clipboard.h"
 #include "ppapi/c/private/ppb_flash_file.h"
+#include "ppapi/c/private/ppb_flash_fullscreen.h"
 #include "ppapi/c/private/ppb_flash_menu.h"
 #include "ppapi/c/private/ppb_flash_net_connector.h"
 #include "ppapi/c/private/ppb_flash_tcp_socket.h"
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index ac7992d..cd54b60 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -822,11 +822,11 @@ IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBInstance_LogWithSource,
                     int /* log_level */,
                     ppapi::proxy::SerializedVar /* source */,
                     ppapi::proxy::SerializedVar /* value */)
-IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBInstance_SetFullscreen,
+IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBInstance_FlashSetFullscreen,
                            PP_Instance /* instance */,
                            PP_Bool /* fullscreen */,
                            PP_Bool /* result */)
-IPC_SYNC_MESSAGE_ROUTED1_2(PpapiHostMsg_PPBInstance_GetScreenSize,
+IPC_SYNC_MESSAGE_ROUTED1_2(PpapiHostMsg_PPBInstance_FlashGetScreenSize,
                            PP_Instance /* instance */,
                            PP_Bool /* result */,
                            PP_Size /* size */)
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index e08e73a..21a429a 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -4,7 +4,6 @@
 
 #include "ppapi/proxy/ppb_instance_proxy.h"
 
-#include "ppapi/c/dev/ppb_fullscreen_dev.h"
 #include "ppapi/c/dev/ppb_mouse_lock_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_var.h"
@@ -84,10 +83,10 @@ bool PPB_Instance_Proxy::OnMessageReceived(const IPC::Message& msg) {
                         OnMsgLogWithSource)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_PostMessage,
                         OnMsgPostMessage)
-    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_SetFullscreen,
-                        OnMsgSetFullscreen)
-    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_GetScreenSize,
-                        OnMsgGetScreenSize)
+    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_FlashSetFullscreen,
+                        OnMsgFlashSetFullscreen)
+    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_FlashGetScreenSize,
+                        OnMsgFlashGetScreenSize)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_RequestInputEvents,
                         OnMsgRequestInputEvents)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_ClearInputEvents,
@@ -182,7 +181,7 @@ void PPB_Instance_Proxy::SelectedFindResultChanged(PP_Instance instance,
   NOTIMPLEMENTED();  // Not proxied yet.
 }
 
-PP_Bool PPB_Instance_Proxy::IsFullscreen(PP_Instance instance) {
+PP_Bool PPB_Instance_Proxy::FlashIsFullscreen(PP_Instance instance) {
   InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())->
       GetInstanceData(instance);
   if (!data)
@@ -190,18 +189,18 @@ PP_Bool PPB_Instance_Proxy::IsFullscreen(PP_Instance instance) {
   return data->fullscreen;
 }
 
-PP_Bool PPB_Instance_Proxy::SetFullscreen(PP_Instance instance,
-                                          PP_Bool fullscreen) {
+PP_Bool PPB_Instance_Proxy::FlashSetFullscreen(PP_Instance instance,
+                                               PP_Bool fullscreen) {
   PP_Bool result = PP_FALSE;
-  dispatcher()->Send(new PpapiHostMsg_PPBInstance_SetFullscreen(
+  dispatcher()->Send(new PpapiHostMsg_PPBInstance_FlashSetFullscreen(
       INTERFACE_ID_PPB_INSTANCE, instance, fullscreen, &result));
   return result;
 }
 
-PP_Bool PPB_Instance_Proxy::GetScreenSize(PP_Instance instance,
-                                          PP_Size* size) {
+PP_Bool PPB_Instance_Proxy::FlashGetScreenSize(PP_Instance instance,
+                                               PP_Size* size) {
   PP_Bool result = PP_FALSE;
-  dispatcher()->Send(new PpapiHostMsg_PPBInstance_GetScreenSize(
+  dispatcher()->Send(new PpapiHostMsg_PPBInstance_FlashGetScreenSize(
       INTERFACE_ID_PPB_INSTANCE, instance, &result, size));
   return result;
 }
@@ -350,20 +349,20 @@ void PPB_Instance_Proxy::OnMsgLogWithSource(PP_Instance instance,
   }
 }
 
-void PPB_Instance_Proxy::OnMsgSetFullscreen(PP_Instance instance,
-                                            PP_Bool fullscreen,
-                                            PP_Bool* result) {
+void PPB_Instance_Proxy::OnMsgFlashSetFullscreen(PP_Instance instance,
+                                                 PP_Bool fullscreen,
+                                                 PP_Bool* result) {
   EnterInstanceNoLock enter(instance, false);
   if (enter.succeeded())
-    *result = enter.functions()->SetFullscreen(instance, fullscreen);
+    *result = enter.functions()->FlashSetFullscreen(instance, fullscreen);
 }
 
-void PPB_Instance_Proxy::OnMsgGetScreenSize(PP_Instance instance,
-                                            PP_Bool* result,
-                                            PP_Size* size) {
+void PPB_Instance_Proxy::OnMsgFlashGetScreenSize(PP_Instance instance,
+                                                 PP_Bool* result,
+                                                 PP_Size* size) {
   EnterInstanceNoLock enter(instance, false);
   if (enter.succeeded())
-    *result = enter.functions()->GetScreenSize(instance, size);
+    *result = enter.functions()->FlashGetScreenSize(instance, size);
 }
 
 void PPB_Instance_Proxy::OnMsgRequestInputEvents(PP_Instance instance,
diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h
index 74784a1..15d7b4e 100644
--- a/ppapi/proxy/ppb_instance_proxy.h
+++ b/ppapi/proxy/ppb_instance_proxy.h
@@ -57,10 +57,11 @@ class PPB_Instance_Proxy : public InterfaceProxy,
                                           PP_Bool final_result) OVERRIDE;
   virtual void SelectedFindResultChanged(PP_Instance instance,
                                          int32_t index) OVERRIDE;
-  virtual PP_Bool IsFullscreen(PP_Instance instance) OVERRIDE;
-  virtual PP_Bool SetFullscreen(PP_Instance instance,
-                                PP_Bool fullscreen) OVERRIDE;
-  virtual PP_Bool GetScreenSize(PP_Instance instance, PP_Size* size) OVERRIDE;
+  virtual PP_Bool FlashIsFullscreen(PP_Instance instance) OVERRIDE;
+  virtual PP_Bool FlashSetFullscreen(PP_Instance instance,
+                                     PP_Bool fullscreen) OVERRIDE;
+  virtual PP_Bool FlashGetScreenSize(PP_Instance instance,
+                                     PP_Size* size) OVERRIDE;
   virtual int32_t RequestInputEvents(PP_Instance instance,
                                      uint32_t event_classes) OVERRIDE;
   virtual int32_t RequestFilteringInputEvents(PP_Instance instance,
@@ -100,12 +101,12 @@ class PPB_Instance_Proxy : public InterfaceProxy,
                           int log_level,
                           SerializedVarReceiveInput source,
                           SerializedVarReceiveInput value);
-  void OnMsgSetFullscreen(PP_Instance instance,
-                          PP_Bool fullscreen,
-                          PP_Bool* result);
-  void OnMsgGetScreenSize(PP_Instance instance,
-                          PP_Bool* result,
-                          PP_Size* size);
+  void OnMsgFlashSetFullscreen(PP_Instance instance,
+                               PP_Bool fullscreen,
+                               PP_Bool* result);
+  void OnMsgFlashGetScreenSize(PP_Instance instance,
+                               PP_Bool* result,
+                               PP_Size* size);
   void OnMsgRequestInputEvents(PP_Instance instance,
                                bool is_filtering,
                                uint32_t event_classes);
diff --git a/ppapi/proxy/ppp_instance_proxy.cc b/ppapi/proxy/ppp_instance_proxy.cc
index aa4b7e7..19b23f8 100644
--- a/ppapi/proxy/ppp_instance_proxy.cc
+++ b/ppapi/proxy/ppp_instance_proxy.cc
@@ -6,10 +6,10 @@
 
 #include <algorithm>
 
-#include "ppapi/c/dev/ppb_fullscreen_dev.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/ppp_instance.h"
+#include "ppapi/c/private/ppb_flash_fullscreen.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
@@ -48,9 +48,9 @@ void DidChangeView(PP_Instance instance,
                    const PP_Rect* position,
                    const PP_Rect* clip) {
   HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
-  const PPB_Fullscreen_Dev* fullscreen_interface =
-      static_cast<const PPB_Fullscreen_Dev*>(
-          dispatcher->local_get_interface()(PPB_FULLSCREEN_DEV_INTERFACE));
+  const PPB_FlashFullscreen* fullscreen_interface =
+      static_cast<const PPB_FlashFullscreen*>(
+          dispatcher->local_get_interface()(PPB_FLASHFULLSCREEN_INTERFACE));
   DCHECK(fullscreen_interface);
   PP_Bool fullscreen = fullscreen_interface->IsFullscreen(instance);
   dispatcher->Send(