Remove NPAPI from browser and utility

chrome/browser/metrics/plugin_metrics_provider.cc

Index: chrome/browser/metrics/plugin_metrics_provider.cc
diff --git a/chrome/browser/metrics/plugin_metrics_provider.cc b/chrome/browser/metrics/plugin_metrics_provider.cc
index 996bbd1260460f83f15a6be910a74aec87a3ac67..425cb220f29bf9d352e25987435772acd2db4693 100644
--- a/chrome/browser/metrics/plugin_metrics_provider.cc
+++ b/chrome/browser/metrics/plugin_metrics_provider.cc
@@ -298,9 +298,9 @@ void PluginMetricsProvider::LogPluginLoadingError(
   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));
   }
@@ -315,8 +315,7 @@ void PluginMetricsProvider::SetPluginsForTesting(
 
 // 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);
 }
 
@@ -356,12 +355,6 @@ void PluginMetricsProvider::BrowserChildProcessCrashed(
   RecordCurrentStateWithDelay(kRecordStateDelayMs);
 }
 
-void PluginMetricsProvider::BrowserChildProcessInstanceCreated(
-    const content::ChildProcessData& data) {
-  GetChildProcessStats(data).instances++;
-  RecordCurrentStateWithDelay(kRecordStateDelayMs);
-}
-
 void PluginMetricsProvider::BrowserChildProcessKilled(
     const content::ChildProcessData& data,
     int exit_code) {