Make desktopui_MashLogin not crash.

This is a short term fix. Long term, we need to fix the underlying bug that
in mus-viz mode, browser process doesn't talk to GPU process.

BUG=796386
TEST=affected tests on chromeos bots
R=piman@chromium.org
TBR=pfeldman@chromium.org

Change-Id: I8fe8e7cbe62c39f035b5ba6cf01b8f82b7d4e241
Reviewed-on: https://chromium-review.googlesource.com/835420
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Antoine Labour <piman@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#525229}

content/browser/devtools/protocol/system_info_handler.cc

@@ -17,6 +17,9 @@
 #include "gpu/config/gpu_feature_type.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/config/gpu_switches.h"
+#if defined(OS_CHROMEOS)
+#include "gpu/config/gpu_util.h"
+#endif
 
 namespace content {
 namespace protocol {
@@ -168,7 +171,15 @@ class SystemInfoHandlerGpuObserver : public content::GpuDataManagerObserver {
 
   void ObserverWatchdogCallback() {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
+#if defined(OS_CHROMEOS)
+    // TODO(zmo): CHECK everywhere once https://crbug.com/796386 is fixed.
+    gpu::GpuFeatureInfo gpu_feature_info =
+        gpu::ComputeGpuFeatureInfoWithHardwareAccelerationDisabled();
+    GpuDataManagerImpl::GetInstance()->UpdateGpuFeatureInfo(gpu_feature_info);
+    UnregisterAndSendResponse();
+#else
     CHECK(false) << "Gathering system GPU info took more than 5 seconds.";
+#endif
   }
 
   void UnregisterAndSendResponse() {