Clean up compositor initialization/destruction.

content/browser/aura/image_transport_factory.cc

Index: content/browser/aura/image_transport_factory.cc
diff --git a/content/browser/aura/image_transport_factory.cc b/content/browser/aura/image_transport_factory.cc
index 2e92dd05111c9285ad8cbb21f72a322918f31987..28b04bf7ea429398f4db5278db3a0da5b6336745 100644
--- a/content/browser/aura/image_transport_factory.cc
+++ b/content/browser/aura/image_transport_factory.cc
@@ -8,7 +8,12 @@
 #include "content/browser/aura/gpu_process_transport_factory.h"
 #include "content/browser/aura/no_transport_image_transport_factory.h"
 #include "content/public/common/content_switches.h"
-#include "ui/compositor/compositor_setup.h"
+#include "ui/compositor/compositor.h"
+#include "ui/compositor/compositor_switches.h"
+
+#if defined(OS_CHROMEOS)
+#include "base/chromeos/chromeos_version.h"
+#endif
 
 namespace content {
 
@@ -16,15 +21,32 @@ namespace {
 ImageTransportFactory* g_factory;
 }
 
+
+static bool UseTestContextAndTransportFactory() {
+#if defined(OS_CHROMEOS)
+  // If the test is running on the chromeos envrionment (such as
+  // device or vm bots), always use real contexts.
+  if (base::chromeos::IsRunningOnChromeOS())
+    return false;
+#endif
+
+  // Only used if the enable command line flag is used.
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  if (!command_line->HasSwitch(switches::kTestCompositor))
+    return false;
+
+  // The disable command line flag preempts the enable flag.
+  if (!command_line->HasSwitch(switches::kDisableTestCompositor))
+    return true;
+
+  return false;
+}
+
 // static
 void ImageTransportFactory::Initialize() {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kTestCompositor)) {
-    ui::SetupTestCompositor();
-  }
-  if (ui::IsTestCompositorEnabled()) {
-    g_factory = new NoTransportImageTransportFactory(
-        new ui::TestContextFactory);
+  if (UseTestContextAndTransportFactory()) {
+    g_factory =
+        new NoTransportImageTransportFactory(new ui::TestContextFactory);
   } else {
     g_factory = new GpuProcessTransportFactory;
   }