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

content/ppapi_plugin/broker_process_dispatcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/ppapi_plugin/broker_process_dispatcher.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 59 matching lines @@
       site_vector.clear();
   }
   context->dispatcher->OnGetPermissionSettingsCompleted(
       context->request_id, PP_ToBool(success), default_permission, site_vector);
 }
 
 }  // namespace
 
 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*>(
             get_plugin_interface_(PPP_FLASH_BROWSEROPERATIONS_INTERFACE_1_0));
 
     flash_browser_operations_1_2_ =
         static_cast<const PPP_Flash_BrowserOperations_1_2*>(
             get_plugin_interface_(PPP_FLASH_BROWSEROPERATIONS_INTERFACE_1_2));
 
     flash_browser_operations_1_3_ =
         static_cast<const PPP_Flash_BrowserOperations_1_3*>(
             get_plugin_interface_(PPP_FLASH_BROWSEROPERATIONS_INTERFACE_1_3));
   }
 }
 
 BrokerProcessDispatcher::~BrokerProcessDispatcher() {
   DVLOG(1) << "BrokerProcessDispatcher::~BrokerProcessDispatcher()";
   // Don't free the process right away. This timer allows the child process
   // to be re-used if the user rapidly goes to a new page that requires this
   // plugin. This is the case for common plugins where they may be used on a
   // source and destination page of a navigation. We don't want to tear down
   // and re-start processes each time in these cases.
   process_ref_.ReleaseWithDelay(
       base::TimeDelta::FromSeconds(kBrokerReleaseTimeSeconds));
 }
 
 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(
     uint32_t request_id,
     bool success,
     PP_Flash_BrowserOperations_Permission default_permission,
     const ppapi::FlashSiteSettings& sites) {
   Send(new PpapiHostMsg_GetPermissionSettingsResult(
       request_id, success, default_permission, sites));
 }
@@ skipping 188 matching lines @@
         data_str.c_str(), setting_type,
         static_cast<uint32_t>(sites.size()), site_array.get());
 
     return PP_ToBool(result);
   }
 
   return false;
 }
 
 }  // namespace content