Remove NPAPI from browser and utility

chrome/browser/metrics/plugin_metrics_provider.cc

 // Copyright 2014 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/metrics/plugin_metrics_provider.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 280 matching lines @@
 void PluginMetricsProvider::LogPluginLoadingError(
     const base::FilePath& plugin_path) {
   content::WebPluginInfo plugin;
   bool success =
       content::PluginService::GetInstance()->GetPluginInfoByPath(plugin_path,
                                                                  &plugin);
   DCHECK(success);
   ChildProcessStats& stats = child_process_stats_buffer_[plugin.name];
   // Initialize the type if this entry is new.
   if (stats.process_type == content::PROCESS_TYPE_UNKNOWN) {
-    // The plugin process might not actually be of type PLUGIN (which means
-    // NPAPI), but we only care that it is *a* plugin process.
-    stats.process_type = content::PROCESS_TYPE_PLUGIN;
+    // The plugin process might not actually be of type PPAPI_PLUGIN, but we
+    // only care that it is *a* plugin process.
+    stats.process_type = content::PROCESS_TYPE_PPAPI_PLUGIN;
   } else {
     DCHECK(IsPluginProcess(stats.process_type));
   }
   stats.loading_errors++;
   RecordCurrentStateWithDelay(kRecordStateDelayMs);
 }
 
 void PluginMetricsProvider::SetPluginsForTesting(
     const std::vector<content::WebPluginInfo>& plugins) {
   plugins_ = plugins;
 }
 
 // static
 bool PluginMetricsProvider::IsPluginProcess(int process_type) {
-  return (process_type == content::PROCESS_TYPE_PLUGIN ||
-          process_type == content::PROCESS_TYPE_PPAPI_PLUGIN ||
+  return (process_type == content::PROCESS_TYPE_PPAPI_PLUGIN ||
           process_type == content::PROCESS_TYPE_PPAPI_BROKER);
 }
 
 // static
 void PluginMetricsProvider::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterListPref(prefs::kStabilityPluginStats);
 }
 
 void PluginMetricsProvider::OnGotPlugins(
     const base::Closure& done_callback,
@@ skipping 19 matching lines @@
   RecordCurrentStateWithDelay(kRecordStateDelayMs);
 }
 
 void PluginMetricsProvider::BrowserChildProcessCrashed(
     const content::ChildProcessData& data,
     int exit_code) {
   GetChildProcessStats(data).process_crashes++;
   RecordCurrentStateWithDelay(kRecordStateDelayMs);
 }
 
-void PluginMetricsProvider::BrowserChildProcessInstanceCreated(
-    const content::ChildProcessData& data) {
-  GetChildProcessStats(data).instances++;
-  RecordCurrentStateWithDelay(kRecordStateDelayMs);
-}
-
 void PluginMetricsProvider::BrowserChildProcessKilled(
     const content::ChildProcessData& data,
     int exit_code) {
   // Treat a kill as a crash, since Flash returns STATUS_DEBUGGER_INACTIVE for
   // actual crashes, which is treated as a kill rather than a crash by
   // base::GetTerminationStatus
   GetChildProcessStats(data).process_crashes++;
   RecordCurrentStateWithDelay(kRecordStateDelayMs);
 }
 
@@ skipping 10 matching lines @@
 }
 
 bool PluginMetricsProvider::RecordCurrentStateIfPending() {
   if (!weak_ptr_factory_.HasWeakPtrs())
     return false;
 
   weak_ptr_factory_.InvalidateWeakPtrs();
   RecordCurrentState();
   return true;
 }