Fix a bug that would cause the plugin_loader to stall.

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 <vector>
 
 #include "base/basictypes.h"
@@ skipping 38 matching lines @@
       public IPC::Sender {
  public:
   PluginLoaderPosix();
 
   // Must be called from the IO thread. The |callback| will be called on the IO
   // thread too.
   void GetPlugins(const PluginService::GetPluginsCallback& callback);
 
   // UtilityProcessHostClient:
   void OnProcessCrashed(int exit_code) override;
+  void OnProcessLaunchFailed() override;
   bool OnMessageReceived(const IPC::Message& message) override;
 
   // IPC::Sender:
   bool Send(IPC::Message* msg) override;
 
  private:
   ~PluginLoaderPosix() override;
 
   // 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);
+  // Returns an iterator to the plugin in |internal_plugins_| whose path
+  // matches |plugin_path|.
+  std::vector<WebPluginInfo>::iterator FindInternalPlugin(
+      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
   // the range of the |canonical_list_|).
   bool MaybeRunPendingCallbacks();
 
+  // Returns true if there are no plugins left to load.
+  bool IsFinishedLoadingPlugins();
+
+  // This method should be called when the plugins are finished loading.
+  // It updates the PluginList's list of plugins, and runs the queued callbacks.
+  void FinishedLoadingPlugins();
+
+  // Launches the utility process that loads the plugins.
+  // Virtual for testing.
+  virtual bool LaunchUtilityProcess();
+
   // The process host for which this is a client.
   base::WeakPtr<UtilityProcessHost> process_host_;
 
   // A list of paths to plugins which will be loaded by the utility process, in
   // the order specified by this vector.
   std::vector<base::FilePath> canonical_list_;
 
   // The index in |canonical_list_| of the plugin that the child process will
   // attempt to load next.
   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::vector<PluginService::GetPluginsCallback> callbacks_;
 
-  // The time at which plugin loading started.
-  base::TimeTicks load_start_time_;
+  // True if there is (or is about to be) a utility process that loads plugins.
+  bool loading_plugins_;
 
   friend class MockPluginLoaderPosix;
   DISALLOW_COPY_AND_ASSIGN(PluginLoaderPosix);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PLUGIN_LOADER_POSIX_H_