Ignore certain messages in plugin broker process if they are not sent by the

content/ppapi_plugin/broker_process_dispatcher.cc

Index: content/ppapi_plugin/broker_process_dispatcher.cc
diff --git a/content/ppapi_plugin/broker_process_dispatcher.cc b/content/ppapi_plugin/broker_process_dispatcher.cc
index 01325531cd35cee481b92a516d4f8831204b2031..eab28768e643ae0de75704834ae5d48f069ccefd 100644
--- a/content/ppapi_plugin/broker_process_dispatcher.cc
+++ b/content/ppapi_plugin/broker_process_dispatcher.cc
@@ -77,12 +77,14 @@ void GetPermissionSettingsCallback(
 
 BrokerProcessDispatcher::BrokerProcessDispatcher(
     PP_GetInterface_Func get_plugin_interface,
-    PP_ConnectInstance_Func connect_instance)
+    PP_ConnectInstance_Func connect_instance,
+    bool peer_is_browser)
     : ppapi::proxy::BrokerSideDispatcher(connect_instance),
       get_plugin_interface_(get_plugin_interface),
       flash_browser_operations_1_3_(NULL),
       flash_browser_operations_1_2_(NULL),
-      flash_browser_operations_1_0_(NULL) {
+      flash_browser_operations_1_0_(NULL),
+      peer_is_browser_(peer_is_browser) {
   if (get_plugin_interface) {
     flash_browser_operations_1_0_ =
         static_cast<const PPP_Flash_BrowserOperations_1_0*>(
@@ -110,17 +112,24 @@ BrokerProcessDispatcher::~BrokerProcessDispatcher() {
 }
 
 bool BrokerProcessDispatcher::OnMessageReceived(const IPC::Message& msg) {
-  IPC_BEGIN_MESSAGE_MAP(BrokerProcessDispatcher, msg)
-    IPC_MESSAGE_HANDLER(PpapiMsg_GetSitesWithData, OnGetSitesWithData)
-    IPC_MESSAGE_HANDLER(PpapiMsg_ClearSiteData, OnClearSiteData)
-    IPC_MESSAGE_HANDLER(PpapiMsg_DeauthorizeContentLicenses,
-                        OnDeauthorizeContentLicenses)
-    IPC_MESSAGE_HANDLER(PpapiMsg_GetPermissionSettings, OnGetPermissionSettings)
-    IPC_MESSAGE_HANDLER(PpapiMsg_SetDefaultPermission, OnSetDefaultPermission)
-    IPC_MESSAGE_HANDLER(PpapiMsg_SetSitePermission, OnSetSitePermission)
-    IPC_MESSAGE_UNHANDLED(return BrokerSideDispatcher::OnMessageReceived(msg))
-  IPC_END_MESSAGE_MAP()
-  return true;
+  if (BrokerSideDispatcher::OnMessageReceived(msg))
+    return true;
+
+  if (peer_is_browser_) {

[jam, 2016/06/15 17:50:38]

nit: might be easier with indentation if you early out instead

[yzshen1, 2016/06/15 18:17:43]

Done.

+    IPC_BEGIN_MESSAGE_MAP(BrokerProcessDispatcher, msg)
+      IPC_MESSAGE_HANDLER(PpapiMsg_GetSitesWithData, OnGetSitesWithData)
+      IPC_MESSAGE_HANDLER(PpapiMsg_ClearSiteData, OnClearSiteData)
+      IPC_MESSAGE_HANDLER(PpapiMsg_DeauthorizeContentLicenses,
+                          OnDeauthorizeContentLicenses)
+      IPC_MESSAGE_HANDLER(PpapiMsg_GetPermissionSettings,
+                          OnGetPermissionSettings)
+      IPC_MESSAGE_HANDLER(PpapiMsg_SetDefaultPermission, OnSetDefaultPermission)
+      IPC_MESSAGE_HANDLER(PpapiMsg_SetSitePermission, OnSetSitePermission)
+      IPC_MESSAGE_UNHANDLED(return false)
+    IPC_END_MESSAGE_MAP()
+  }
+
+  return false;
 }
 
 void BrokerProcessDispatcher::OnGetPermissionSettingsCompleted(