Revert 258763 "Adds plumbing to pass WebUI mojo::Handle from bro..."

Broke compile on Linux Builder (dbg):
FAILED: /b/build/goma/gomacc c++ -MMD -MF obj/content/gen/mojo/common/mojo/content_common_mojo_bindings.render_process.mojom.o.d -DCONTENT_IMPLEMENTATION -DV8_DEPRECATION_WARNINGS -DBLINK_SCALE_FILTERS_AT_RECORD_TIME -D_FILE_OFFSET_BITS=64 -DCHROMIUM_BUILD -DCOMPONENT_BUILD -DTOOLKIT_VIEWS=1 -DUI_COMPOSITOR_IMAGE_TRANSPORT -DUSE_AURA=1 -DUSE_CAIRO=1 -DUSE_GLIB=1 -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_LIBJPEG_TURBO=1 -DUSE_MOJO=1 -DUSE_X11=1 -DUSE_CLIPBOARD_AURAX11=1 -DENABLE_ONE_CLICK_SIGNIN -DUSE_XI2_MT=2 -DENABLE_REMOTING=1 -DENABLE_WEBRTC=1 -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_INPUT_SPEECH -DENABLE_NOTIFICATIONS -DUSE_UDEV -DENABLE_EGLIMAGE=1 -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_AUTOMATION=1 -DENABLE_GOOGLE_NOW=1 -DCLD_VERSION=2 -DENABLE_FULL_PRINTING=1 -DENABLE_PRINTING=1 -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_MANAGED_USERS=1 -DENABLE_MDNS=1 -DENABLE_SERVICE_DISCOVERY=1 -DUSE_NSS=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_DEBUG -I../.. -Igen -fstack-protector --param=ssp-buffer-size=4 -Werror -pthread -fno-exceptions -fno-strict-aliasing -Wall -Wno-unused-parameter -Wno-missing-field-initializers -fvisibility=hidden -pipe -fPIC -msse2 -mfpmath=sse -mmmx -m32 -O0 -g -funwind-tables -fno-rtti -fno-threadsafe-statics -fvisibility-inlines-hidden -Wsign-compare  -c gen/mojo/common/mojo/render_process.mojom.cc -o obj/content/gen/mojo/common/mojo/content_common_mojo_bindings.render_process.mojom.o
gen/mojo/common/mojo/render_process.mojom.cc:10:54: fatalerror: content/common/mojo/render_process.mojom.h: No such file or directory
compilation terminated.

> Adds plumbing to pass WebUI mojo::Handle from browser to renderer
> 
> See the test for details on how it'll all work out in practice.
> 
> BUG=none
> TEST=none
> R=darin@chromium.org
> 
> Review URL: https://codereview.chromium.org/206923002

TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/208263008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258769 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 12 deletions

diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h
index 46b408c..1fc85d2 100644
--- a/content/browser/renderer_host/render_process_host_impl.h
+++ b/content/browser/renderer_host/render_process_host_impl.h
@@ -23,11 +23,6 @@
 #include "ipc/ipc_platform_file.h"
 #include "ui/surface/transport_dib.h"
 
-#if defined(USE_MOJO)
-#include "content/common/mojo/render_process.mojom.h"
-#include "mojo/public/bindings/remote_ptr.h"
-#endif
-
 struct ViewHostMsg_CompositorSurfaceBuffersSwapped_Params;
 
 namespace base {
@@ -56,7 +51,7 @@ class StoragePartition;
 class StoragePartitionImpl;
 
 #if defined(USE_MOJO)
-class RenderProcessHostMojoImpl;
+class MojoChannelInit;
 #endif
 
 // Implements a concrete RenderProcessHost for the browser process for talking
@@ -242,11 +237,6 @@ class CONTENT_EXPORT RenderProcessHostImpl
   void IncrementWorkerRefCount();
   void DecrementWorkerRefCount();
 
-#if defined(USE_MOJO)
-  void SetWebUIHandle(int32 view_routing_id,
-                      mojo::ScopedMessagePipeHandle handle);
-#endif
-
  protected:
   // A proxy for our IPC::Channel that lives on the IO thread (see
   // browser_process.h)
@@ -310,6 +300,11 @@ class CONTENT_EXPORT RenderProcessHostImpl
   void SendDisableAecDumpToRenderer();
 #endif
 
+#if defined(USE_MOJO)
+  // Establishes the mojo channel to the renderer.
+  void CreateMojoChannel();
+#endif
+
   // The registered IPC listener objects. When this list is empty, we should
   // delete ourselves.
   IDMap<IPC::Listener> listeners_;
@@ -437,7 +432,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
   int worker_ref_count_;
 
 #if defined(USE_MOJO)
-  scoped_ptr<RenderProcessHostMojoImpl> render_process_host_mojo_;
+  scoped_ptr<MojoChannelInit> mojo_channel_init_;
 #endif
 
   base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_;