Back out r121057 from the trunk due to a compile failure.

http://build.chromium.org/p/chromium/builders/Win%20Aura/builds/5477/steps/compile/logs/stdio

Use PluginInstaller to update outdated plug-ins.

TBR=arv@chromium.org
BUG=92796
TEST=TBD


Review URL: http://codereview.chromium.org/9107038

TBR=bauerb@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9348073

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121074 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 13 deletions

diff --git a/chrome/browser/plugin_finder.h b/chrome/browser/plugin_finder.h
index 2b1bd49..a0e88b7 100644
--- a/chrome/browser/plugin_finder.h
+++ b/chrome/browser/plugin_finder.h
@@ -15,7 +15,6 @@
 #include "base/string16.h"
 
 namespace base {
-class DictionaryValue;
 class ListValue;
 }
 
@@ -33,15 +32,12 @@ class PluginFinder {
   static scoped_ptr<base::ListValue> LoadPluginList();
 
   // Finds a plug-in for the given MIME type and language (specified as an IETF
-  // language tag, i.e. en-US) and calls the callback with the PluginInstaller
-  // for the plug-in, or NULL if no plug-in is found.
+  // language tag, i.e. en-US) and calls one of the two passed in callbacks,
+  // depending on whether a plug-in is found.
   void FindPlugin(const std::string& mime_type,
                   const std::string& language,
-                  const FindPluginCallback& callback);
-
-  // Finds the plug-in with the given identifier and calls the callback.
-  void FindPluginWithIdentifier(const std::string& identifier,
-                                const FindPluginCallback& callback);
+                  const FindPluginCallback& found_callback,
+                  const base::Closure& not_found_callback);
 
  private:
   friend struct DefaultSingletonTraits<PluginFinder>;
@@ -51,11 +47,6 @@ class PluginFinder {
 
   static base::ListValue* LoadPluginListInternal();
 
-  PluginInstaller* CreateInstaller(const std::string& identifier,
-                                   const base::DictionaryValue* plugin_dict);
-  PluginInstaller* FindPluginInternal(const std::string& mime_type,
-                                      const std::string& language);
-
   scoped_ptr<base::ListValue> plugin_list_;
   std::map<std::string, PluginInstaller*> installers_;