Revert of Adds the ability for the renderer to create the mojo channel

content/browser/renderer_host/render_process_host_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_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_
 
 #include <map>
 #include <queue>
 #include <string>
@@ skipping 22 matching lines @@
 namespace gfx {
 class Size;
 }
 
 namespace content {
 class AudioRendererHost;
 class BrowserDemuxerAndroid;
 class GeolocationDispatcherHost;
 class GpuMessageFilter;
 class MessagePortMessageFilter;
-class MojoChannelInit;
 class PeerConnectionTrackerHost;
 class RendererMainThread;
 class RenderWidgetHelper;
 class RenderWidgetHost;
 class RenderWidgetHostImpl;
 class RenderWidgetHostViewFrameSubscriber;
 class ScreenOrientationDispatcherHost;
 class StoragePartition;
 class StoragePartitionImpl;
 
@@ skipping 235 matching lines @@
   void ProcessDied(bool already_dead);
 
   virtual void OnGpuSwitching() OVERRIDE;
 
 #if defined(ENABLE_WEBRTC)
   // Sends |file_for_transit| to the render process.
   void SendAecDumpFileToRenderer(IPC::PlatformFileForTransit file_for_transit);
   void SendDisableAecDumpToRenderer();
 #endif
 
-  // Establishes the mojo channel to the renderer.
-  void CreateMojoChannel();
-
   // The registered IPC listener objects. When this list is empty, we should
   // delete ourselves.
   IDMap<IPC::Listener> listeners_;
 
   // The count of currently visible widgets.  Since the host can be a container
   // for multiple widgets, it uses this count to determine when it should be
   // backgrounded.
   int32 visible_widgets_;
 
   // Does this process have backgrounded priority.
@@ skipping 101 matching lines @@
   scoped_refptr<BrowserDemuxerAndroid> browser_demuxer_android_;
 #endif
 
   // Message filter for geolocation messages.
   GeolocationDispatcherHost* geolocation_dispatcher_host_;
 
 #if defined(ENABLE_WEBRTC)
   base::Callback<void(const std::string&)> webrtc_log_message_callback_;
 #endif
 
+  // Lives on the browser's ChildThread.
+  base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_;
+
   // Message filter and dispatcher for screen orientation.
   ScreenOrientationDispatcherHost* screen_orientation_dispatcher_host_;
 
   int worker_ref_count_;
 
-  // TODO(sky): remove ifdef, temporary until mac sorted out.
-#if !defined(OS_MACOSX)
-  scoped_ptr<MojoChannelInit> mojo_channel_init_;
-#endif
-
-  base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(RenderProcessHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_