Remove NPAPI from browser and utility

chrome/browser/task_management/providers/child_process_task_unittest.cc

 // Copyright 2015 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 <stdint.h>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/task_management/providers/child_process_task.h"
@@ skipping 13 matching lines @@
 namespace task_management {
 
 namespace {
 
 // Will be used to test the translation from |content::ProcessType| to
 // |task_management::Task::Type|.
 struct ProcessTypeTaskTypePair {
   int process_type_;
   Task::Type expected_task_type_;
 } process_task_types_pairs[] = {
-    { content::PROCESS_TYPE_PLUGIN, Task::PLUGIN },
     { content::PROCESS_TYPE_PPAPI_PLUGIN, Task::PLUGIN },
     { content::PROCESS_TYPE_PPAPI_BROKER, Task::PLUGIN },
     { content::PROCESS_TYPE_UTILITY, Task::UTILITY },
     { content::PROCESS_TYPE_ZYGOTE, Task::ZYGOTE },
     { content::PROCESS_TYPE_SANDBOX_HELPER, Task::SANDBOX_HELPER },
     { content::PROCESS_TYPE_GPU, Task::GPU },
     { PROCESS_TYPE_NACL_LOADER, Task::NACL },
     { PROCESS_TYPE_NACL_BROKER, Task::NACL },
 };
 
@@ skipping 63 matching lines @@
   ChildProcessData data1(0);
   ASSERT_EQ(base::kNullProcessHandle, data1.handle);
   provider.BrowserChildProcessLaunchedAndConnected(data1);
   EXPECT_TRUE(provided_tasks_.empty());
 
   const int unique_id = 245;
   const base::string16 name(base::UTF8ToUTF16("Test Task"));
   const base::string16 expected_name(l10n_util::GetStringFUTF16(
       IDS_TASK_MANAGER_PLUGIN_PREFIX, name));
 
-  ChildProcessData data2(content::PROCESS_TYPE_PLUGIN);
+  ChildProcessData data2(content::PROCESS_TYPE_PPAPI_PLUGIN);
   data2.handle = base::GetCurrentProcessHandle();
   data2.name = name;
   data2.id = unique_id;
   provider.BrowserChildProcessLaunchedAndConnected(data2);
   ASSERT_EQ(1U, provided_tasks_.size());
 
   Task* task = provided_tasks_.begin()->second;
   EXPECT_EQ(base::GetCurrentProcessHandle(), task->process_handle());
   EXPECT_EQ(base::GetCurrentProcId(), task->process_id());
   EXPECT_EQ(expected_name, task->title());
@@ skipping 48 matching lines @@
     provider.BrowserChildProcessHostDisconnected(data);
     EXPECT_TRUE(provided_tasks_.empty());
   }
 
   provider.ClearObserver();
   EXPECT_TRUE(AreProviderContainersEmpty(provider));
 }
 
 }  // namespace task_management