Revert 279557 "Support exposing Mojo services between render fra..."

trunk/src/content/renderer/render_frame_impl.cc

Index: trunk/src/content/renderer/render_frame_impl.cc
===================================================================
--- trunk/src/content/renderer/render_frame_impl.cc	(revision 279559)
+++ trunk/src/content/renderer/render_frame_impl.cc	(working copy)
@@ -408,12 +408,12 @@
       geolocation_dispatcher_(NULL),
       screen_orientation_dispatcher_(NULL),
       weak_factory_(this) {
+  RenderThread::Get()->AddRoute(routing_id_, this);
+
   std::pair<RoutingIDFrameMap::iterator, bool> result =
       g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this));
   CHECK(result.second) << "Inserting a duplicate item.";
 
-  RenderThread::Get()->AddRoute(routing_id_, this);
-
   render_view_->RegisterRenderFrame(this);
 
 #if defined(OS_ANDROID)
@@ -904,11 +904,6 @@
   render_view_->pending_navigation_params_.reset();
 }
 
-void RenderFrameImpl::BindServiceRegistry(
-    mojo::ScopedMessagePipeHandle service_provider_handle) {
-  service_registry_.BindRemoteServiceProvider(service_provider_handle.Pass());
-}
-
 void RenderFrameImpl::OnBeforeUnload() {
   // TODO(creis): Right now, this is only called on the main frame.  Make the
   // browser process send dispatchBeforeUnloadEvent to every frame that needs
@@ -1321,10 +1316,6 @@
   OnJavaScriptExecuteRequest(javascript, 0, false);
 }
 
-ServiceRegistry* RenderFrameImpl::GetServiceRegistry() {
-  return &service_registry_;
-}
-
 // blink::WebFrameClient implementation ----------------------------------------
 
 blink::WebPlugin* RenderFrameImpl::createPlugin(