Revert of Move content's shell connections to the IO thread

content/child/child_thread_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_CHILD_CHILD_THREAD_IMPL_H_
 #define CONTENT_CHILD_CHILD_THREAD_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/shared_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/sequenced_task_runner.h"
 #include "base/tracked_objects.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
 #include "content/public/child/child_thread.h"
 #include "ipc/ipc_message.h"  // For IPC_MESSAGE_LOG_ENABLED.
 #include "ipc/ipc_platform_file.h"
 #include "ipc/message_router.h"
+#include "services/shell/public/cpp/service.h"
 
 namespace base {
 class MessageLoop;
 }  // namespace base
 
 namespace IPC {
 class MessageFilter;
 class SyncChannel;
 class SyncMessageFilter;
 }  // namespace IPC
@@ skipping 24 matching lines @@
 class QuotaMessageFilter;
 class ResourceDispatcher;
 class ThreadSafeSender;
 class WebSocketDispatcher;
 class WebSocketMessageFilter;
 struct RequestInfo;
 
 // The main thread of a child process derives from this class.
 class CONTENT_EXPORT ChildThreadImpl
     : public IPC::Listener,
-      virtual public ChildThread {
+      virtual public ChildThread,
+      public NON_EXPORTED_BASE(shell::Service){
  public:
   struct CONTENT_EXPORT Options;
 
   // Creates the thread.
   ChildThreadImpl();
   // Allow to be used for single-process mode and for in process gpu mode via
   // options.
   explicit ChildThreadImpl(const Options& options);
   // ChildProcess::main_thread() is reset after Shutdown(), and before the
   // destructor, so any subsystem that relies on ChildProcess::main_thread()
@@ skipping 11 matching lines @@
 #if defined(OS_WIN)
   void PreCacheFont(const LOGFONT& log_font) override;
   void ReleaseCachedFonts() override;
 #endif
   void RecordAction(const base::UserMetricsAction& action) override;
   void RecordComputedAction(const std::string& action) override;
   MojoShellConnection* GetMojoShellConnection() override;
   shell::InterfaceRegistry* GetInterfaceRegistry() override;
   shell::InterfaceProvider* GetRemoteInterfaces() override;
 
+  // shell::Service:
+  shell::InterfaceRegistry* GetInterfaceRegistryForConnection() override;
+  shell::InterfaceProvider* GetInterfaceProviderForConnection() override;
+
   IPC::SyncChannel* channel() { return channel_.get(); }
 
   IPC::MessageRouter* GetRouter();
 
   // Allocates a block of shared memory of the given size. Returns NULL on
   // failure.
   // Note: On posix, this requires a sync IPC to the browser process,
   // but on windows the child process directly allocates the block.
   std::unique_ptr<base::SharedMemory> AllocateSharedMemory(size_t buf_size);
 
@@ skipping 84 matching lines @@
   // process.
   static void ShutdownThread();
 #endif
 
  protected:
   friend class ChildProcess;
 
   // Called when the process refcount is 0.
   void OnProcessFinalRelease();
 
-  // Implemented by subclasses to attach ConnectionFilters to the thread's
-  // shell connection.
-  virtual void AddConnectionFilters(MojoShellConnection* connection);
-
   virtual bool OnControlMessageReceived(const IPC::Message& msg);
   virtual void OnProcessBackgrounded(bool backgrounded);
   virtual void OnProcessPurgeAndSuspend();
 
   // IPC::Listener implementation:
   bool OnMessageReceived(const IPC::Message& msg) override;
   void OnChannelConnected(int32_t peer_pid) override;
   void OnChannelError() override;
 
   bool IsInBrowserProcess() const;
@@ skipping 24 matching lines @@
   void OnSetProfilerStatus(tracked_objects::ThreadData::Status status);
   void OnGetChildProfilerData(int sequence_number, int current_profiling_phase);
   void OnProfilingPhaseCompleted(int profiling_phase);
 #ifdef IPC_MESSAGE_LOG_ENABLED
   void OnSetIPCLoggingEnabled(bool enable);
 #endif
 
   void EnsureConnected();
 
   std::unique_ptr<mojo::edk::ScopedIPCSupport> mojo_ipc_support_;
+  std::unique_ptr<MojoShellConnection> mojo_shell_connection_;
   std::unique_ptr<shell::InterfaceRegistry> interface_registry_;
   std::unique_ptr<shell::InterfaceProvider> remote_interfaces_;
-  std::unique_ptr<MojoShellConnection> mojo_shell_connection_;
 
   std::string channel_name_;
   std::unique_ptr<IPC::SyncChannel> channel_;
 
   // Allows threads other than the main thread to send sync messages.
   scoped_refptr<IPC::SyncMessageFilter> sync_message_filter_;
 
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
 
   // Implements message routing functionality to the consumers of
@@ skipping 33 matching lines @@
 
   std::unique_ptr<ChildGpuMemoryBufferManager> gpu_memory_buffer_manager_;
 
   std::unique_ptr<ChildDiscardableSharedMemoryManager>
       discardable_shared_memory_manager_;
 
   std::unique_ptr<base::PowerMonitor> power_monitor_;
 
   scoped_refptr<base::SequencedTaskRunner> browser_process_io_runner_;
 
-  std::unique_ptr<base::WeakPtrFactory<ChildThreadImpl>>
-      channel_connected_factory_;
-
-  base::WeakPtrFactory<ChildThreadImpl> weak_factory_;
+  base::WeakPtrFactory<ChildThreadImpl> channel_connected_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildThreadImpl);
 };
 
 struct ChildThreadImpl::Options {
   Options(const Options& other);
   ~Options();
 
   class Builder;
 
@@ skipping 21 matching lines @@
 
  private:
   struct Options options_;
 
   DISALLOW_COPY_AND_ASSIGN(Builder);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_CHILD_THREAD_IMPL_H_