Revert of p1 mus+ash chrome renders ui and content

content/browser/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//content/browser/browser.gni")
 import("//media/media_options.gni")
 
 source_set("browser") {
@@ skipping 403 matching lines @@
     ]
   }
 
   if (use_aura) {
     deps += [
       "//ui/aura",
       "//ui/aura_extra",
       "//ui/strings",
       "//ui/views/mus:for_component",
       "//ui/wm",
-      "//components/bitmap_uploader",
     ]
-    sources += [
-      "compositor/software_output_device_mus.cc",
-      "compositor/software_output_device_mus.h",
-    ]
-    defines += [ "MOJO_RUNNER_CLIENT" ]
   } else {  # Not aura.
     sources -= [
       "media/capture/cursor_renderer_aura.cc",
       "media/capture/cursor_renderer_aura.h",
       "renderer_host/compositor_resize_lock_aura.cc",
       "renderer_host/compositor_resize_lock_aura.h",
       "renderer_host/input/synthetic_gesture_target_aura.cc",
       "renderer_host/input/synthetic_gesture_target_aura.h",
       "renderer_host/input/touch_selection_controller_client_aura.cc",
       "renderer_host/input/touch_selection_controller_client_aura.h",
@@ skipping 90 matching lines @@
 
   if (enable_webvr && is_android) {
     sources += [
       "vr/android/cardboard/cardboard_vr_device.cc",
       "vr/android/cardboard/cardboard_vr_device.h",
       "vr/android/cardboard/cardboard_vr_device_provider.cc",
       "vr/android/cardboard/cardboard_vr_device_provider.h",
     ]
   }
 }