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

trunk/src/content/renderer/render_thread_impl.h

Index: trunk/src/content/renderer/render_thread_impl.h
===================================================================
--- trunk/src/content/renderer/render_thread_impl.h	(revision 279559)
+++ trunk/src/content/renderer/render_thread_impl.h	(working copy)
@@ -166,7 +166,6 @@
   virtual void PreCacheFont(const LOGFONT& log_font) OVERRIDE;
   virtual void ReleaseCachedFonts() OVERRIDE;
 #endif
-  virtual ServiceRegistry* GetServiceRegistry() OVERRIDE;
 
   // Synchronously establish a channel to the GPU plugin if not previously
   // established or if it has been lost (for example if the GPU plugin crashed).
@@ -401,9 +400,6 @@
   void AddEmbeddedWorkerRoute(int32 routing_id, IPC::Listener* listener);
   void RemoveEmbeddedWorkerRoute(int32 routing_id);
 
-  void RegisterPendingRenderFrameConnect(int routing_id,
-                                         mojo::ScopedMessagePipeHandle handle);
-
  private:
   // ChildThread
   virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE;
@@ -429,6 +425,13 @@
       unsigned internalformat,
       unsigned usage) OVERRIDE;
 
+  // mojo::ServiceProvider implementation:
+  virtual void ConnectToService(
+      const mojo::String& service_url,
+      const mojo::String& service_name,
+      mojo::ScopedMessagePipeHandle message_pipe,
+      const mojo::String& requestor_url) OVERRIDE;
+
   void Init();
 
   void OnSetZoomLevelForCurrentURL(const std::string& scheme,
@@ -577,8 +580,6 @@
   bool is_zero_copy_enabled_;
   bool is_one_copy_enabled_;
 
-  std::map<int, mojo::MessagePipeHandle> pending_render_frame_connects_;
-
   DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl);
 };