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

trunk/src/content/child/child_thread.h

Index: trunk/src/content/child/child_thread.h
===================================================================
--- trunk/src/content/child/child_thread.h	(revision 279559)
+++ trunk/src/content/child/child_thread.h	(working copy)
@@ -13,10 +13,10 @@
 #include "base/memory/weak_ptr.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/tracked_objects.h"
-#include "content/child/mojo/mojo_application.h"
 #include "content/common/content_export.h"
 #include "content/common/message_router.h"
 #include "ipc/ipc_message.h"  // For IPC_MESSAGE_LOG_ENABLED.
+#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 
 namespace base {
 class MessageLoop;
@@ -44,6 +44,7 @@
 class ChildResourceMessageFilter;
 class ChildSharedBitmapManager;
 class FileSystemDispatcher;
+class MojoApplication;
 class ServiceWorkerDispatcher;
 class ServiceWorkerMessageFilter;
 class QuotaDispatcher;
@@ -55,7 +56,10 @@
 struct RequestInfo;
 
 // The main thread of a child process derives from this class.
-class CONTENT_EXPORT ChildThread : public IPC::Listener, public IPC::Sender {
+class CONTENT_EXPORT ChildThread
+    : public IPC::Listener,
+      public IPC::Sender,
+      public NON_EXPORTED_BASE(mojo::ServiceProvider) {
  public:
   // Creates the thread.
   ChildThread();
@@ -149,10 +153,6 @@
   static void ShutdownThread();
 #endif
 
-  ServiceRegistry* service_registry() const {
-    return mojo_application_->service_registry();
-  }
-
  protected:
   friend class ChildProcess;
 
@@ -170,6 +170,13 @@
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
   virtual void OnChannelError() 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;
+
  private:
   class ChildThreadMessageRouter : public MessageRouter {
    public: