Move Mojo channel initialization closer to IPC::Channel setup

content/renderer/mojo/mojo_render_process_observer.h

Index: content/renderer/mojo/mojo_render_process_observer.h
diff --git a/content/renderer/mojo/mojo_render_process_observer.h b/content/renderer/mojo/mojo_render_process_observer.h
index 2bee59d435d88129e436da435e8e15a857c2baf1..8826fba6fe5f5e9bdb4ce7bc42b08b4642fd489f 100644
--- a/content/renderer/mojo/mojo_render_process_observer.h
+++ b/content/renderer/mojo/mojo_render_process_observer.h
@@ -6,7 +6,7 @@
 #define CONTENT_RENDERER_MOJO_MOJO_RENDER_PROCESS_OBSERVER_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "content/common/mojo/render_process.mojom.h"
+#include "content/common/render_process.mojom.h"
 #include "content/public/renderer/render_process_observer.h"
 #include "ipc/ipc_platform_file.h"
 #include "mojo/public/cpp/bindings/remote_ptr.h"
@@ -27,20 +27,20 @@ class RenderThread;
 // MojoRenderProcessObserver deletes itself when the RenderProcess is shutdown.
 class MojoRenderProcessObserver
     : public content::RenderProcessObserver,
-      public RenderProcessMojo {
+      public IRenderProcess {
  public:
   MojoRenderProcessObserver(RenderThread* render_thread);
 
-  // RenderProcessObserver overrides:
+  // RenderProcessObserver methods:
   virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnRenderProcessShutdown() OVERRIDE;
 
  private:
   virtual ~MojoRenderProcessObserver();
 
-  void OnChannelCreated(const IPC::PlatformFileForTransit& file);
+  void OnActivate(const IPC::PlatformFileForTransit& file);
 
-  // RenderProcessMojo overrides:
+  // IRenderProcess methods:
   virtual void SetWebUIHandle(
       int32 view_routing_id,
       mojo::ScopedMessagePipeHandle web_ui_handle) OVERRIDE;
@@ -49,7 +49,7 @@ class MojoRenderProcessObserver
 
   scoped_ptr<MojoChannelInit> channel_init_;
 
-  mojo::RemotePtr<content::RenderProcessHostMojo> render_process_host_mojo_;
+  mojo::RemotePtr<IRenderProcessHost> render_process_host_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoRenderProcessObserver);
 };