Revert "Ensure RenderFrameHostImpl's RenderFrameSetupPtr doesn't die too early"

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index c1c14271a73a2558628c21240503339c22e31346..e2bf47bc3e6b179002fb72ed4f1a3fdf6525290b 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -40,6 +40,7 @@
 #include "content/common/inter_process_time_ticks_converter.h"
 #include "content/common/navigation_params.h"
 #include "content/common/platform_notification_messages.h"
+#include "content/common/render_frame_setup.mojom.h"
 #include "content/common/swapped_out_messages.h"
 #include "content/public/browser/ax_event_notification_details.h"
 #include "content/public/browser/browser_accessibility_state.h"
@@ -203,11 +204,11 @@ RenderFrameHostImpl::RenderFrameHostImpl(RenderViewHostImpl* render_view_host,
   }
 
   if (GetProcess()->GetServiceRegistry()) {
-    GetProcess()->GetServiceRegistry()->ConnectToRemoteService(
-        &render_frame_setup_);
+    RenderFrameSetupPtr setup;
+    GetProcess()->GetServiceRegistry()->ConnectToRemoteService(&setup);
     mojo::ServiceProviderPtr service_provider;
-    render_frame_setup_->GetServiceProviderForFrame(
-        routing_id_, mojo::GetProxy(&service_provider));
+    setup->GetServiceProviderForFrame(routing_id_,
+                                      mojo::GetProxy(&service_provider));
     service_registry_.BindRemoteServiceProvider(
         service_provider.PassMessagePipe());