Ensure RenderFrameHostImpl's RenderFrameSetupPtr doesn't die too early

content/browser/frame_host/render_frame_host_impl.h

Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index 3fcb8e2fb33b8f8dc9ca208b5904f7093fc63417..dbce027a974dc5122c61a0b02567e6b324cf4e97 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -19,6 +19,7 @@
 #include "content/common/accessibility_mode_enums.h"
 #include "content/common/content_export.h"
 #include "content/common/mojo/service_registry_impl.h"
+#include "content/common/render_frame_setup.mojom.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/common/javascript_message_type.h"
 #include "net/http/http_response_headers.h"
@@ -565,6 +566,14 @@ class CONTENT_EXPORT RenderFrameHostImpl
   // response once it has started.
   scoped_ptr<StreamHandle> stream_handle_;
 
+  // Holds the browser-side handle to the pipe used to establish the Mojo
+  // connection between this instance and its associated render frame.
+  // TODO(blundell): Change this back to being a local variable if/once Mojo
+  // is changed to guarantee that message writes that are pending when the proxy
+  // pointer dies are delivered. See the discussion on the mojo-dev@ thread
+  // "Advice request to track down a flaky dropped message".
+  RenderFrameSetupPtr render_frame_setup_;
+
   // NOTE: This must be the last member.
   base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;