Move broker creation out of PepperHelperImpl to PPB_Broker_Impl in the effort to eliminate PepperHe…

content/common/view_messages.h

 // 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.
 
 // IPC messages for page rendering.
 // Multiply-included message file, hence no include guard.
 
 #include "base/memory/shared_memory.h"
 #include "base/process/process.h"
 #include "base/strings/string16.h"
@@ skipping 1196 matching lines @@
                     IPC::PlatformFileForTransit /* file descriptor */,
                     int /* message_id */)
 
 // Tells the renderer that the network state has changed and that
 // window.navigator.onLine should be updated for all WebViews.
 IPC_MESSAGE_CONTROL1(ViewMsg_NetworkStateChanged,
                      bool /* online */)
 
 // Reply to ViewHostMsg_OpenChannelToPpapiBroker
 // Tells the renderer that the channel to the broker has been created.
-IPC_MESSAGE_ROUTED3(ViewMsg_PpapiBrokerChannelCreated,
-                    int /* request_id */,
+IPC_MESSAGE_ROUTED2(ViewMsg_PpapiBrokerChannelCreated,
                     base::ProcessId /* broker_pid */,
                     IPC::ChannelHandle /* handle */)
 
 // Reply to ViewHostMsg_RequestPpapiBrokerPermission.
 // Tells the renderer whether permission to access to PPAPI broker was granted
 // or not.
-IPC_MESSAGE_ROUTED2(ViewMsg_PpapiBrokerPermissionResult,
-                    int /* request_id */,
+IPC_MESSAGE_ROUTED1(ViewMsg_PpapiBrokerPermissionResult,
                     bool /* result */)
 
 // Tells the renderer to empty its plugin list cache, optional reloading
 // pages containing plugins.
 IPC_MESSAGE_CONTROL1(ViewMsg_PurgePluginListCache,
                      bool /* reload_pages */)
 
 // Sent to the renderer when a popup window should no longer count against
 // the current popup count (either because it's not a popup or because it was
 // a generated by a user action).
@@ skipping 661 matching lines @@
 // Message from the renderer to the browser indicating the in-process instance
 // has been destroyed.
 IPC_MESSAGE_CONTROL1(ViewHostMsg_DidDeleteInProcessInstance,
                      int32 /* instance */)
 
 // A renderer sends this to the browser process when it wants to
 // create a ppapi broker.  The browser will create the broker process
 // if necessary, and will return a handle to the channel on success.
 // On error an empty string is returned.
 // The browser will respond with ViewMsg_PpapiBrokerChannelCreated.
-IPC_MESSAGE_CONTROL3(ViewHostMsg_OpenChannelToPpapiBroker,
+IPC_MESSAGE_CONTROL2(ViewHostMsg_OpenChannelToPpapiBroker,
                      int /* routing_id */,
-                     int /* request_id */,
                      base::FilePath /* path */)
 
 // Opens a Pepper file asynchronously. The response returns a file descriptor
 // and an error code from base/platform_file.h.
 IPC_MESSAGE_CONTROL4(ViewHostMsg_AsyncOpenPepperFile,
                      int /* routing_id */,
                      base::FilePath /* file path */,
                      int /* pp_open_flags */,
                      int /* message_id */)
 
 // A renderer sends this to the browser process when it wants to access a PPAPI
 // broker. In contrast to ViewHostMsg_OpenChannelToPpapiBroker, this is called
 // for every connection.
 // The browser will respond with ViewMsg_PpapiBrokerPermissionResult.
 IPC_MESSAGE_ROUTED3(ViewHostMsg_RequestPpapiBrokerPermission,
-                    int /* request_id */,
+                    int /* routing_id */,
                     GURL /* document_url */,
                     base::FilePath /* plugin_path */)
 
 #if defined(USE_X11)
 // A renderer sends this when it needs a browser-side widget for
 // hosting a windowed plugin. id is the XID of the plugin window, for which
 // the container is created.
 IPC_SYNC_MESSAGE_ROUTED1_0(ViewHostMsg_CreatePluginContainer,
                            gfx::PluginWindowHandle /* id */)
 
@@ skipping 427 matching lines @@
 // synchronously (see crbug.com/120597). This IPC message sends the character
 // bounds after every composition change to always have correct bound info.
 IPC_MESSAGE_ROUTED2(ViewHostMsg_ImeCompositionRangeChanged,
                     ui::Range /* composition range */,
                     std::vector<gfx::Rect> /* character bounds */)
 #endif
 
 // Adding a new message? Stick to the sort order above: first platform
 // independent ViewMsg, then ifdefs for platform specific ViewMsg, then platform
 // independent ViewHostMsg, then ifdefs for platform specific ViewHostMsg.