content: Allow software compositing on Chrome OS if requested

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 673074c04b6d73ab55077a9f0565db1cbdc7a68f..9b52f815570a258783a6ee6d10e028000eaf4e5d 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -253,8 +253,11 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
 
   if (num_attempts > kNumRetriesBeforeSoftwareFallback) {
 #if defined(OS_CHROMEOS)
-    LOG(FATAL) << "Unable to create a UI graphics context, and cannot use "
-               << "software compositing on ChromeOS.";
+    if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kDisableGpu)) {
+      LOG(FATAL) << "Unable to create a UI graphics context, and cannot use "
+                 << "software compositing on ChromeOS.";
+    }
 #endif
     create_gpu_output_surface = false;
   }