Remove NPAPI from browser and utility

chrome/browser/chrome_plugin_browsertest.cc

Index: chrome/browser/chrome_plugin_browsertest.cc
diff --git a/chrome/browser/chrome_plugin_browsertest.cc b/chrome/browser/chrome_plugin_browsertest.cc
index 1dbe769510bee277347936b37c28104741de831d..a119fb03a8955dd26b62782a0869660d95ca33bb 100644
--- a/chrome/browser/chrome_plugin_browsertest.cc
+++ b/chrome/browser/chrome_plugin_browsertest.cc
@@ -171,10 +171,8 @@ class ChromePluginTest : public InProcessBrowserTest {
   static void CrashFlashInternal(const base::Closure& quit_task) {
     bool found = false;
     for (content::BrowserChildProcessHostIterator iter; !iter.Done(); ++iter) {
-      if (iter.GetData().process_type != content::PROCESS_TYPE_PLUGIN &&
-          iter.GetData().process_type != content::PROCESS_TYPE_PPAPI_PLUGIN) {
+      if (iter.GetData().process_type != content::PROCESS_TYPE_PPAPI_PLUGIN)
         continue;
-      }
       base::Process process = base::Process::DeprecatedGetProcessFromHandle(
           iter.GetData().handle);
       process.Terminate(0, true);
@@ -194,10 +192,8 @@ class ChromePluginTest : public InProcessBrowserTest {
 
   static void CountPluginProcesses(int* count, const base::Closure& quit_task) {
     for (content::BrowserChildProcessHostIterator iter; !iter.Done(); ++iter) {
-      if (iter.GetData().process_type == content::PROCESS_TYPE_PLUGIN ||
-          iter.GetData().process_type == content::PROCESS_TYPE_PPAPI_PLUGIN) {
+      if (iter.GetData().process_type == content::PROCESS_TYPE_PPAPI_PLUGIN)
         (*count)++;
-      }
     }
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, quit_task);
   }