GN: Add mojo_shell_tests, get more things working on android

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")
 
 config("storage_config") {
   if (is_android) {
@@ skipping 361 matching lines @@
   if (use_aura || is_mac) {
     sources += rebase_path(
       content_browser_gypi_values.compositor_browser_sources,
       ".", "//content")
     if (!use_x11) {
       sources -= [
         "compositor/software_output_device_x11.cc",
         "compositor/software_output_device_x11.h",
       ]
     }
+
+    if (!use_ozone) {
+      sources -= [
+        "compositor/overlay_candidate_validator_ozone.cc",
+        "compositor/overlay_candidate_validator_ozone.h",
+        "compositor/software_output_device_ozone.cc",
+        "compositor/software_output_device_ozone.h",
+      ]
+    }
     deps += [ "//ui/compositor" ]
   }
 
-  if (!use_ozone) {
-    sources -= [
-      "compositor/overlay_candidate_validator_ozone.cc",
-      "compositor/overlay_candidate_validator_ozone.h",
-      "compositor/software_output_device_ozone.cc",
-      "compositor/software_output_device_ozone.h",
-    ]
-  }
-
   if (enable_web_speech) {
     deps += [
       "//third_party/flac",
       "//third_party/speex",
     ]
   }
 
   if (is_linux) {
     if (use_dbus) {
       sources -= [
         "geolocation/empty_wifi_data_provider.cc",
       ]
       deps += [ "//dbus" ]
     } else {
       # This will already have gotten removed for all non-Linux cases.
        sources -= [ "geolocation/wifi_data_provider_linux.cc" ]
     }
   }
 }