Revert 157773 - This is followup from Charlie's comments on Fady's cl: http://chromiumcodereview.ap…

content/common/browser_plugin_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.
 
 // Multiply-included message header, no traditional include guard.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/process.h"
@@ skipping 36 matching lines @@
 IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_UpdateRect_ACK,
                     int /* instance_id */,
                     int /* message_id */,
                     gfx::Size /* repaint_view_size */)
 
 // A BrowserPlugin sends this to the browser process when it wants to navigate
 // to a given src URL. If a guest WebContents already exists, it will navigate
 // that WebContents. If not, it will create the WebContents, associate it with
 // the BrowserPlugin's browser-side BrowserPluginHost as a guest, and navigate
 // it to the requested URL.
-IPC_MESSAGE_ROUTED4(BrowserPluginHostMsg_NavigateGuest,
+IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_NavigateOrCreateGuest,
                     int /* instance_id*/,
-                    int64 /* frame_id */,
-                    std::string /* src */,
-                    gfx::Size /* size */)
+                    long long /* frame_id */,
+                    std::string /* src */)
 
 // When a BrowserPlugin has been removed from the embedder's DOM, it informs
 // the browser process to cleanup the guest.
 IPC_MESSAGE_ROUTED1(BrowserPluginHostMsg_PluginDestroyed,
                     int /* instance_id */)
 
 // -----------------------------------------------------------------------------
 // These messages are from the guest renderer to the browser process
 
 IPC_STRUCT_BEGIN(BrowserPluginHostMsg_ResizeGuest_Params)
   // A handle to the new buffer to use to transport damage to the
   // embedder renderer process.
   IPC_STRUCT_MEMBER(TransportDIB::Id, damage_buffer_id)
-#if defined(OS_WIN)
-  // The size of the damage buffer because this information is not available
-  // on Windows.
-  IPC_STRUCT_MEMBER(int, damage_buffer_size)
-#endif
   // The new width of the plugin container.
   IPC_STRUCT_MEMBER(int, width)
   // The new height of the plugin container.
   IPC_STRUCT_MEMBER(int, height)
   // Indicates whether the embedder is currently waiting on a ACK from the
   // guest for a previous resize request.
   IPC_STRUCT_MEMBER(bool, resize_pending)
   // Indicates the scale factor of the embedder WebView.
   IPC_STRUCT_MEMBER(float, scale_factor)
 IPC_STRUCT_END()
@@ skipping 59 matching lines @@
 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_AdvanceFocus,
                      int /* instance_id */,
                      bool /* reverse */)
 
 // The guest has damage it wants to convey to the embedder so that it can
 // update its backing store.
 IPC_MESSAGE_CONTROL3(BrowserPluginMsg_UpdateRect,
                      int /* instance_id */,
                      int /* message_id */,
                      BrowserPluginMsg_UpdateRect_Params)