Revert of [DevTools] Move SystemInfo domain to generated handler

content/browser/gpu/gpu_internals_ui.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/gpu/gpu_internals_ui.h"
 
 #if defined(OS_LINUX) && defined(USE_X11)
 #include <X11/Xlib.h>
 #endif
 
@@ skipping 379 matching lines @@
 base::Value* GpuMessageHandler::OnRequestLogMessages(const base::ListValue*) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   return GpuDataManagerImpl::GetInstance()->GetLogMessages();
 }
 
 void GpuMessageHandler::OnGpuInfoUpdate() {
   // Get GPU Info.
   scoped_ptr<base::DictionaryValue> gpu_info_val(GpuInfoAsDictionaryValue());
 
-
   // Add in blacklisting features
   base::DictionaryValue* feature_status = new base::DictionaryValue;
   feature_status->Set("featureStatus", GetFeatureStatus());
   feature_status->Set("problems", GetProblems());
-  base::ListValue* workarounds = new base::ListValue();
-  for (const std::string& workaround : GetDriverBugWorkarounds())
-    workarounds->AppendString(workaround);
-  feature_status->Set("workarounds", workarounds);
-  gpu_info_val->Set("featureStatus", feature_status);
+  feature_status->Set("workarounds", GetDriverBugWorkarounds());
+  if (feature_status)
+    gpu_info_val->Set("featureStatus", feature_status);
 
   // Send GPU Info to javascript.
   web_ui()->CallJavascriptFunction("browserBridge.onGpuInfoUpdate",
       *(gpu_info_val.get()));
 }
 
 void GpuMessageHandler::OnGpuSwitched() {
   GpuDataManagerImpl::GetInstance()->RequestCompleteGpuInfoIfNeeded();
 }
 
@@ skipping 10 matching lines @@
     : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new GpuMessageHandler());
 
   // Set up the chrome://gpu/ source.
   BrowserContext* browser_context =
       web_ui->GetWebContents()->GetBrowserContext();
   WebUIDataSource::Add(browser_context, CreateGpuHTMLSource());
 }
 
 }  // namespace content