Revert of p1 mus+ash chrome renders ui and content

content/browser/compositor/gpu_process_transport_factory.cc

Index: content/browser/compositor/gpu_process_transport_factory.cc
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 2b9cd69683d4ed6c4b9a8f643ec0d72b30c34b0c..7e2c513b98ee9302d10509f564f4869f85cc7422 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -28,7 +28,6 @@
 #include "content/browser/compositor/offscreen_browser_compositor_output_surface.h"
 #include "content/browser/compositor/reflector_impl.h"
 #include "content/browser/compositor/software_browser_compositor_output_surface.h"
-#include "content/browser/compositor/software_output_device_mus.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 #include "content/browser/gpu/compositor_util.h"
@@ -149,14 +148,6 @@
 scoped_ptr<cc::SoftwareOutputDevice>
 GpuProcessTransportFactory::CreateSoftwareOutputDevice(
     ui::Compositor* compositor) {
-#if defined(MOJO_RUNNER_CLIENT)
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          "mojo-platform-channel-handle")) {
-    return scoped_ptr<cc::SoftwareOutputDevice>(
-        new SoftwareOutputDeviceMus(compositor));
-  }
-#endif
-
 #if defined(OS_WIN)
   return scoped_ptr<cc::SoftwareOutputDevice>(
       new SoftwareOutputDeviceWin(software_backing_.get(), compositor));
@@ -201,16 +192,6 @@
 }
 
 static bool ShouldCreateGpuOutputSurface(ui::Compositor* compositor) {
-#if defined(MOJO_RUNNER_CLIENT)
-  // Chrome running as a mojo app currently can only use software compositing.
-  // TODO(rjkroege): http://crbug.com/548451
-  // TODO(rjkroege): Make IsRunningInMojoRunner callable from content.
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          "mojo-platform-channel-handle")) {
-    return false;
-  }
-#endif
-
 #if defined(OS_CHROMEOS)
   // Software fallback does not happen on Chrome OS.
   return true;