Split the ProcessType enum into process types that content knows about (which will remain in src\co…

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 <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/chrome_process_type.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "net/base/net_util.h"
@@ skipping 122 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().type != content::PROCESS_TYPE_PLUGIN &&
-          iter.GetData().type != content::PROCESS_TYPE_PPAPI_PLUGIN) {
+      if (iter.GetData().process_type != content::PROCESS_TYPE_PLUGIN &&
+          iter.GetData().process_type != content::PROCESS_TYPE_PPAPI_PLUGIN) {
         continue;
       }
       base::KillProcess(iter.GetData().handle, 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<webkit::WebPluginInfo>* rv,
       const base::Closure& quit_task,
       const std::vector<webkit::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().type == content::PROCESS_TYPE_PLUGIN ||
-          iter.GetData().type == content::PROCESS_TYPE_PPAPI_PLUGIN) {
+      if (iter.GetData().process_type == content::PROCESS_TYPE_PLUGIN ||
+          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.
@@ skipping 61 matching lines @@
   std::vector<webkit::WebPluginInfo> plugins = GetPlugins();
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(expected); ++i) {
     size_t j = 0;
     for (; j < plugins.size(); ++j) {
       if (plugins[j].name == ASCIIToUTF16(expected[i]))
         break;
     }
     ASSERT_TRUE(j != plugins.size()) << "Didn't find " << expected[i];
   }
 }