Finish moving plugin probing out of process.

chrome/browser/browser_about_handler.cc

Index: chrome/browser/browser_about_handler.cc
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index d4a076382dc592724a0e16623a9dda67cd8008d3..d83710ec2dd3e4d2f2699c995a265f5fbddb6396 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ -46,6 +47,7 @@
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/gpu/gpu_process_host.h"
+#include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/sensors/sensors_provider.h"
@@ -63,7 +65,6 @@
 #include "v8/include/v8.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_WIN)
@@ -1156,8 +1157,8 @@ std::string AboutVersionStrings(DictionaryValue* localized_strings,
 
   // Obtain the version of the first enabled Flash plugin.
   std::vector<webkit::WebPluginInfo> info_array;
-  webkit::npapi::PluginList::Singleton()->GetPluginInfoArray(
-      GURL(), "application/x-shockwave-flash", false, NULL, &info_array, NULL);
+  PluginService::GetInstance()->GetPluginInfoArray(
+      GURL(), "application/x-shockwave-flash", false, &info_array, NULL);
   string16 flash_version =
       l10n_util::GetStringUTF16(IDS_PLUGINS_DISABLED_PLUGIN);
   PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(profile);
@@ -1230,6 +1231,21 @@ std::string AboutVersionStrings(DictionaryValue* localized_strings,
   return data;
 }
 
+// Used as a callback for PluginService::GetPlugins().
+void HandleAboutVersionStrings(AboutSource* source,
+                               int request_id,
+                               const std::vector<webkit::WebPluginInfo>&) {
+#if defined(OS_CHROMEOS)
+  new ChromeOSAboutVersionHandler(source, request_id);
+#else
+  DictionaryValue localized_strings;
+  localized_strings.SetString("os_version", "");
+  source->FinishDataRequest(
+      AboutVersionStrings(&localized_strings, source->profile()),
+      request_id);
+#endif
+}
+
 // AboutMemoryHandler ----------------------------------------------------------
 
 // Helper for AboutMemory to bind results from a ProcessMetrics object
@@ -1459,14 +1475,12 @@ void AboutSource::StartDataRequest(const std::string& path,
 #endif
   } else if (host == chrome::kChromeUIVersionHost) {
     if (path == kStringsJsPath) {
-#if defined(OS_CHROMEOS)
-      new ChromeOSAboutVersionHandler(this, request_id);
+      // The Flash version information is needed on this page, so make sure
+      // the plugins are loaded.
+      PluginService::GetInstance()->GetPlugins(
+          base::Bind(&HandleAboutVersionStrings,
+                     make_scoped_refptr(this), request_id));
       return;
-#else
-      DictionaryValue localized_strings;
-      localized_strings.SetString("os_version", "");
-      response = AboutVersionStrings(&localized_strings, profile_);
-#endif
     } else {
       response = AboutVersionStaticContent(path);
     }