Fix about:system output.

chrome/browser/ui/webui/chromeos/system_info_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 "chrome/browser/ui/webui/chromeos/system_info_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 153 matching lines @@
                     l10n_util::GetStringUTF16(IDS_ABOUT_SYS_COLLAPSE));
   SetFontAndTextDirection(&strings);
 
   if (logs_ || sys_info_) {
     ListValue* details = new ListValue();
     strings.Set("details", details);
     if (logs_) {
       chromeos::system::LogDictionaryType::iterator it;
       for (it = logs_->begin(); it != logs_->end(); ++it) {
         DictionaryValue* val = new DictionaryValue;
+        // Skip the 'debugd' key; this is a duplicate of all the logs that
+        // we're already getting from the debugd daemon. This will be fixed
+        // with http://code.google.com/p/chromium/issues/detail?id=138582
+        // which incidentally will also remove this code.
+        if (it->first == "debugd")
+          continue;
+
         val->SetString("stat_name", it->first);
         val->SetString("stat_value", it->second);
         details->Append(val);
       }
       delete logs_;
     }
     if (sys_info_) {
       chromeos::system::SysInfoResponse::iterator it;
       for (it = sys_info_->begin(); it != sys_info_->end(); ++it) {
         DictionaryValue* val = new DictionaryValue;
-        // Prefix stats coming from debugd with 'debugd-' for now. The code that
-        // displays stats can only handle one stat with a given name, so this
-        // prevents names from overlapping. Once the duplicates have been
-        // removed from userfeedback's list by
-        // <https://gerrit.chromium.org/gerrit/25106>, the prefix can go away.
-        val->SetString("stat_name", "debugd-" + it->first);
+        val->SetString("stat_name", it->first);
         val->SetString("stat_value", it->second);
         details->Append(val);
       }
       delete sys_info_;
     }
     strings.SetString("anchor", path_);
   }
   static const base::StringPiece systeminfo_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_ABOUT_SYS_HTML, ui::SCALE_FACTOR_NONE));
@@ skipping 26 matching lines @@
 
 SystemInfoUI::SystemInfoUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   SystemInfoHandler* handler = new SystemInfoHandler();
   web_ui->AddMessageHandler(handler);
   SystemInfoUIHTMLSource* html_source = new SystemInfoUIHTMLSource();
 
   // Set up the chrome://system/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   ChromeURLDataManager::AddDataSource(profile, html_source);
 }