Create RenderFrameProxyHost at time of swap-out instead of commit.

content/renderer/render_frame_proxy.h

Index: content/renderer/render_frame_proxy.h
diff --git a/content/renderer/render_frame_proxy.h b/content/renderer/render_frame_proxy.h
new file mode 100644
index 0000000000000000000000000000000000000000..31f3250f28f4c21351f98ae204e743b814aa7444
--- /dev/null
+++ b/content/renderer/render_frame_proxy.h
@@ -0,0 +1,63 @@
+// Copyright 2014 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.
+
+#ifndef CONTENT_RENDERER_RENDER_FRAME_PROXY_H_
+#define CONTENT_RENDERER_RENDER_FRAME_PROXY_H_
+
+#include "base/basictypes.h"
+#include "content/common/content_export.h"
+#include "ipc/ipc_listener.h"
+#include "ipc/ipc_sender.h"
+
+#include "third_party/WebKit/public/web/WebFrameClient.h"
+#include "third_party/WebKit/public/web/WebRemoteFrame.h"
+
+namespace content {
+
+class RenderFrameImpl;
+class RenderViewImpl;
+
+class CONTENT_EXPORT RenderFrameProxy

[Charlie Reis, 2014/05/15 00:32:50]

Can you add a class-level comment for this, mainly mentioning that it's a
placeholder for RenderFrames in other processes?  (We should probably have a
TODO somewhere in this file to remove the RenderFrame part of it as well.)

[nasko, 2014/05/15 18:47:13]

Done.

+    : public IPC::Listener,
+      public IPC::Sender,
+      NON_EXPORTED_BASE(public blink::WebFrameClient) {
+ public:
+  static RenderFrameProxy* CreateFrameProxy(int routing_id,
+                                            int frame_routing_id);
+
+  // Returns the RenderFrameProxy for the given routing ID.
+  static RenderFrameProxy* FromRoutingID(int routing_id);
+
+  virtual ~RenderFrameProxy();
+
+  // IPC::Sender
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
+
+  RenderFrameImpl* render_frame() {
+    return render_frame_;
+  }
+
+  void set_render_frame(RenderFrameImpl* render_frame) {
+    render_frame_ = render_frame;
+  }
+
+ private:
+  RenderFrameProxy(int routing_id, int frame_routing_id);
+
+  // IPC::Listener
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+
+  // IPC handlers
+  void OnDeleteProxy();
+
+  int routing_id_;
+  int frame_routing_id_;
+  RenderFrameImpl* render_frame_;
+
+  DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy);
+};
+
+}  // namespace
+
+#endif  // CONTENT_RENDERER_RENDER_FRAME_PROXY_H_