content: remove unnecessary code

AFAICT gpu_process_transport_factory is not compiled on android, (see
https://chromium.googlesource.com/chromium/src/+/master/content/browser/BUILD.gn#2454  ),
yet it has some ifdefs for android. This removes the ifdefs as well as moving
an include to match where gpu_process_transport_factory is compiled.

BUG=none
TEST=none

Change-Id: I005fb4db009b36383079faf2c41bb19d89e20e84
Reviewed-on: https://chromium-review.googlesource.com/c/1350981Reviewed-by: Antoine Labour <piman@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611252}

content/browser/browser_main_loop.cc

@@ -61,7 +61,6 @@
 #include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/child_process_security_policy_impl.h"
-#include "content/browser/compositor/gpu_process_transport_factory.h"
 #include "content/browser/compositor/surface_utils.h"
 #include "content/browser/compositor/viz_process_transport_factory.h"
 #include "content/browser/dom_storage/dom_storage_area.h"
@@ -149,6 +148,7 @@
 #include "ui/gfx/switches.h"
 
 #if defined(USE_AURA) || defined(OS_MACOSX)
+#include "content/browser/compositor/gpu_process_transport_factory.h"
 #include "content/browser/compositor/image_transport_factory.h"
 #endif
 

content/browser/compositor/gpu_process_transport_factory.cc

@@ -105,8 +105,6 @@
 #include "content/browser/compositor/gpu_output_surface_mac.h"
 #include "ui/base/cocoa/remote_layer_api.h"
 #include "ui/base/ui_base_switches.h"
-#elif defined(OS_ANDROID)
-#include "components/viz/service/display_embedder/compositor_overlay_candidate_validator_android.h"
 #endif
 #if !defined(GPU_SURFACE_HANDLE_IS_ACCELERATED_WINDOW)
 #include "gpu/ipc/common/gpu_surface_tracker.h"
@@ -283,8 +281,6 @@ CreateOverlayCandidateValidator(
     validator.reset(
         new viz::CompositorOverlayCandidateValidatorMac(ca_layers_disabled));
   }
-#elif defined(OS_ANDROID)
-  validator.reset(new viz::CompositorOverlayCandidateValidatorAndroid());
 #elif defined(OS_WIN)
   validator = std::make_unique<viz::CompositorOverlayCandidateValidatorWin>();
 #endif