Merge 161210 - Only register the newer one of {bundled, component} Pepper Flash.

content/browser/plugin_service_impl.cc

Index: content/browser/plugin_service_impl.cc
===================================================================
--- content/browser/plugin_service_impl.cc	(revision 161614)
+++ content/browser/plugin_service_impl.cc	(working copy)
@@ -736,6 +736,11 @@
   return plugin_list_->GetPluginGroupName(plugin_name);
 }
 
+void PluginServiceImpl::GetInternalPlugins(
+    std::vector<webkit::WebPluginInfo>* plugins) {
+  plugin_list_->GetInternalPlugins(plugins);
+}
+
 webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() {
   return plugin_list_;
 }