Include PPAPI plugin crashes in the plugin crash data.

chrome/browser/metrics/metrics_service.cc

 // Copyright (c) 2011 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.
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
 //
 // A MetricsService instance is typically created at application startup.  It
@@ skipping 160 matching lines @@
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/guid.h"
 #include "chrome/common/metrics_log_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/load_notification_details.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/render_process_host.h"
-#include "content/common/child_process_info.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/url_fetcher.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/webplugininfo.h"
 
 // TODO(port): port browser_distribution.h.
 #if !defined(OS_POSIX)
 #include "chrome/installer/util/browser_distribution.h"
 #endif
 
@@ skipping 1159 matching lines @@
       break;
 
     case content::NOTIFICATION_CHILD_INSTANCE_CREATED:
       stats.instances++;
       break;
 
     case content::NOTIFICATION_CHILD_PROCESS_CRASHED:
       stats.process_crashes++;
       // Exclude plugin crashes from the count below because we report them via
       // a separate UMA metric.
-      if (child_details->type() != ChildProcessInfo::PLUGIN_PROCESS) {
+      if (!IsPluginProcess(child_details->type())) {
         IncrementPrefValue(prefs::kStabilityChildProcessCrashCount);
       }
       break;
 
     default:
       NOTREACHED() << "Unexpected notification type " << type;
       return;
   }
 }
 
@@ skipping 96 matching lines @@
   }
 
   // Now go through and add dictionaries for plugins that didn't already have
   // reports in Local State.
   for (std::map<string16, ChildProcessStats>::iterator cache_iter =
            child_process_stats_buffer_.begin();
        cache_iter != child_process_stats_buffer_.end(); ++cache_iter) {
     ChildProcessStats stats = cache_iter->second;
 
     // Insert only plugins information into the plugins list.
-    if (ChildProcessInfo::PLUGIN_PROCESS != stats.process_type)
+    if (!IsPluginProcess(stats.process_type))
       continue;
 
     // TODO(viettrungluu): remove conversion
     std::string plugin_name = UTF16ToUTF8(cache_iter->first);
 
     DictionaryValue* plugin_dict = new DictionaryValue;
 
     plugin_dict->SetString(prefs::kStabilityPluginName, plugin_name);
     plugin_dict->SetInteger(prefs::kStabilityPluginLaunches,
                             stats.process_launches);
@@ skipping 25 matching lines @@
   pref->SetBoolean(path, value);
   RecordCurrentState(pref);
 }
 
 void MetricsService::RecordCurrentState(PrefService* pref) {
   pref->SetInt64(prefs::kStabilityLastTimestampSec, Time::Now().ToTimeT());
 
   RecordPluginChanges(pref);
 }
 
+// static
+bool MetricsService::IsPluginProcess(ChildProcessInfo::ProcessType type) {
+  switch (type) {
+    case ChildProcessInfo::PLUGIN_PROCESS:
+#if defined(OS_CHROMEOS)
+    case ChildProcessInfo::PPAPI_PLUGIN_PROCESS:

[jar (doing other things), 2011/11/08 22:16:31]

Could you just use a traditional logical ||, and not bother with the ifdef
OS_CHROMEOS?  I think the process type enum is defined in both cases, and the
code would be much more readable.

[petkov, 2011/11/09 14:21:07]

Done.

+#endif
+      return true;
+    default:
+      break;
+  }
+  return false;
+}
+
 static bool IsSingleThreaded() {
   static base::PlatformThreadId thread_id = 0;
   if (!thread_id)
     thread_id = base::PlatformThread::CurrentId();
   return base::PlatformThread::CurrentId() == thread_id;
 }
 
 #if defined(OS_CHROMEOS)
 void MetricsService::StartExternalMetrics() {
   external_metrics_ = new chromeos::ExternalMetrics;
   external_metrics_->Start();
 }
 #endif
 
 // static
 bool MetricsServiceHelper::IsMetricsReportingEnabled() {
   bool result = false;
   const PrefService* local_state = g_browser_process->local_state();
   if (local_state) {
     const PrefService::Preference* uma_pref =
         local_state->FindPreference(prefs::kMetricsReportingEnabled);
     if (uma_pref) {
       bool success = uma_pref->GetValue()->GetAsBoolean(&result);
       DCHECK(success);
     }
   }
   return result;
 }