Restart plugin loading only if the plugin list has actually become stale.

content/browser/plugin_loader_posix.h

 // 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.
 
 #ifndef CONTENT_BROWSER_PLUGIN_LOADER_POSIX_H_
 #define CONTENT_BROWSER_PLUGIN_LOADER_POSIX_H_
 
-#include <deque>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/public/browser/utility_process_host_client.h"
 #include "content/public/common/webplugininfo.h"
 #include "ipc/ipc_sender.h"
@@ skipping 25 matching lines @@
 //    load, bypassing the problematic plugin.
 // 5. This algorithm continues until the canonical list has been walked to the
 //    end, after which the list of loaded plugins is set on the PluginList and
 //    the completion callback is run.
 class CONTENT_EXPORT PluginLoaderPosix
     : public NON_EXPORTED_BASE(UtilityProcessHostClient),
       public IPC::Sender {
  public:
   PluginLoaderPosix();
 
-  // Must be called from the IO thread.
-  void LoadPlugins(
-      scoped_refptr<base::MessageLoopProxy> target_loop,
-      const PluginService::GetPluginsCallback& callback);
+  // Must be called from the IO thread. The |callback| will be called on the IO
+  // thread too.
+  void GetPlugins(const PluginService::GetPluginsCallback& callback);
 
   // UtilityProcessHostClient:
   virtual void OnProcessCrashed(int exit_code) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // IPC::Sender:
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
  private:
-  struct PendingCallback {
-    PendingCallback(scoped_refptr<base::MessageLoopProxy> target_loop,
-                    const PluginService::GetPluginsCallback& callback);
-    ~PendingCallback();
-
-    scoped_refptr<base::MessageLoopProxy> target_loop;
-    PluginService::GetPluginsCallback callback;
-  };
-
   virtual ~PluginLoaderPosix();
 
   // Called on the FILE thread to get the list of plugin paths to probe.
   void GetPluginsToLoad();
 
   // Must be called on the IO thread.
   virtual void LoadPluginsInternal();
 
+  // Called after plugin loading has finished, if we don't know whether the
+  // plugin list has been invalidated in the mean time.
+  void GetPluginsWrapper(
+      const PluginService::GetPluginsCallback& callback,
+      const std::vector<WebPluginInfo>& plugins_unused);
+
   // Message handlers.
   void OnPluginLoaded(uint32 index, const WebPluginInfo& plugin);
   void OnPluginLoadFailed(uint32 index, const base::FilePath& plugin_path);
 
   // Checks if the plugin path is an internal plugin, and, if it is, adds it to
   // |loaded_plugins_|.
   bool MaybeAddInternalPlugin(const base::FilePath& plugin_path);
 
   // Runs all the registered callbacks on each's target loop if the condition
   // for ending the load process is done (i.e. the |next_load_index_| is outside
@@ skipping 12 matching lines @@
   size_t next_load_index_;
 
   // Internal plugins that have been registered at the time of loading.
   std::vector<WebPluginInfo> internal_plugins_;
 
   // A vector of plugins that have been loaded successfully.
   std::vector<WebPluginInfo> loaded_plugins_;
 
   // The callback and message loop on which the callback will be run when the
   // plugin loading process has been completed.
-  std::deque<PendingCallback> callbacks_;
+  std::vector<PluginService::GetPluginsCallback> callbacks_;
 
   // The time at which plugin loading started.
   base::TimeTicks load_start_time_;
 
   friend class MockPluginLoaderPosix;
   DISALLOW_COPY_AND_ASSIGN(PluginLoaderPosix);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PLUGIN_LOADER_POSIX_H_