Add a Content API around BrowserChildProcessHost, similar to what was done with ChildProcessHost....

content/browser/plugin_service_impl.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 "content/browser/plugin_service_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 64 matching lines @@
   CHECK(false) << "Plugin loading should happen out-of-process.";
 #endif
 }
 
 }  // namespace
 
 #if defined(OS_MACOSX)
 static void NotifyPluginsOfActivation() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  for (BrowserChildProcessHost::Iterator iter(
-           content::PROCESS_TYPE_PLUGIN);
-       !iter.Done(); ++iter) {
-    PluginProcessHost* plugin = static_cast<PluginProcessHost*>(*iter);
-    plugin->OnAppActivation();
-  }
+  for (PluginProcessHostIterator iter; !iter.Done(); ++iter)
+    iter->OnAppActivation();
 }
 #endif
 #if defined(OS_POSIX) && !defined(OS_OPENBSD)
 // Delegate class for monitoring directories.
 class PluginDirWatcherDelegate : public FilePathWatcher::Delegate {
   virtual void OnFilePathChanged(const FilePath& path) OVERRIDE {
     VLOG(1) << "Watched path changed: " << path.value();
     // Make the plugin list update itself
     webkit::npapi::PluginList::Singleton()->RefreshPlugins();
     BrowserThread::PostTask(
@@ skipping 123 matching lines @@
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&PluginServiceImpl::RegisterFilePathWatcher, watcher,
                    plugin_dirs[i], file_watcher_delegate_));
     file_watchers_.push_back(watcher);
   }
 #endif
 }
 
 PluginProcessHost* PluginServiceImpl::FindNpapiPluginProcess(
     const FilePath& plugin_path) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  for (BrowserChildProcessHost::Iterator iter(content::PROCESS_TYPE_PLUGIN);
-       !iter.Done(); ++iter) {
-    PluginProcessHost* plugin = static_cast<PluginProcessHost*>(*iter);
-    if (plugin->info().path == plugin_path)
-      return plugin;
+  for (PluginProcessHostIterator iter; !iter.Done(); ++iter) {
+    if (iter->info().path == plugin_path)
+      return *iter;
   }
 
   return NULL;
 }
 
 PpapiPluginProcessHost* PluginServiceImpl::FindPpapiPluginProcess(
     const FilePath& plugin_path) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  for (BrowserChildProcessHost::Iterator iter(
-           content::PROCESS_TYPE_PPAPI_PLUGIN);
-       !iter.Done(); ++iter) {
-    PpapiPluginProcessHost* plugin =
-        static_cast<PpapiPluginProcessHost*>(*iter);
-    if (plugin->plugin_path() == plugin_path)
-      return plugin;
+  for (PpapiPluginProcessHostIterator iter; !iter.Done(); ++iter) {
+    if (iter->plugin_path() == plugin_path)
+      return *iter;
   }
 
   return NULL;
 }
 
 PpapiPluginProcessHost* PluginServiceImpl::FindPpapiBrokerProcess(
     const FilePath& broker_path) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  for (BrowserChildProcessHost::Iterator iter(
-           content::PROCESS_TYPE_PPAPI_BROKER);
-       !iter.Done(); ++iter) {
-    PpapiPluginProcessHost* broker =
-        static_cast<PpapiPluginProcessHost*>(*iter);
-    if (broker->plugin_path() == broker_path)
-      return broker;
+  for (PpapiBrokerProcessHostIterator iter; !iter.Done(); ++iter) {
+    if (iter->plugin_path() == broker_path)
+      return *iter;
   }
 
   return NULL;
 }
 
 PluginProcessHost* PluginServiceImpl::FindOrStartNpapiPluginProcess(
     const FilePath& plugin_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   PluginProcessHost* plugin_host = FindNpapiPluginProcess(plugin_path);
@@ skipping 388 matching lines @@
   plugin_list_->RegisterInternalPlugin(info, add_at_beginning);
 }
 
 string16 PluginServiceImpl::GetPluginGroupName(const std::string& plugin_name) {
   return plugin_list_->GetPluginGroupName(plugin_name);
 }
 
 webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() {
   return plugin_list_;
 }