Remove NPAPI from browser and utility

chrome/browser/chrome_plugin_browsertest.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 <stddef.h>
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 153 matching lines @@
         FROM_HERE,
         base::Bind(&CountPluginProcesses, &actual, runner->QuitClosure()));
     runner->Run();
     ASSERT_EQ(expected, actual);
   }
 
  private:
   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);
       found = true;
     }
     ASSERT_TRUE(found) << "Didn't find Flash process!";
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, quit_task);
   }
 
   static void GetPluginsInfoCallback(
       std::vector<content::WebPluginInfo>* rv,
       const base::Closure& quit_task,
       const std::vector<content::WebPluginInfo>& plugins) {
     *rv = plugins;
     quit_task.Run();
   }
 
   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);
   }
 };
 
 // Tests a bunch of basic scenarios with Flash.
 // This test fails under ASan on Mac, see http://crbug.com/147004.
 // It fails elsewhere, too.  See http://crbug.com/152071.
 IN_PROC_BROWSER_TEST_F(ChromePluginTest, DISABLED_Flash) {
   // Official builds always have bundled Flash.
@@ skipping 52 matching lines @@
   for (size_t i = 0; i < arraysize(expected); ++i) {
     size_t j = 0;
     for (; j < plugins.size(); ++j) {
       if (plugins[j].name == base::ASCIIToUTF16(expected[i]))
         break;
     }
     ASSERT_TRUE(j != plugins.size()) << "Didn't find " << expected[i];
   }
 }
 #endif