Finish moving plugin probing out of process.

chrome/browser/browser_about_handler.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/browser_about_handler.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/i18n/number_formatting.h"
 #include "base/json/json_writer.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_table.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
@@ skipping 17 matching lines @@
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/about_handler.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/render_messages.h"
 #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"
 #include "content/common/gpu/gpu_messages.h"
 #include "crypto/nss_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #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)
 #include "chrome/browser/enumerate_modules_model_win.h"
 #elif defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ skipping 1082 matching lines @@
   localized_strings->SetString("platform",
                                l10n_util::GetStringUTF16(IDS_PLATFORM_LABEL));
   localized_strings->SetString("os_type", version_info.OSType());
   localized_strings->SetString("webkit_version",
                                webkit_glue::GetWebKitVersion());
   localized_strings->SetString("js_engine", "V8");
   localized_strings->SetString("js_version", v8::V8::GetVersion());
 
   // 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);
   for (size_t i = 0; i < info_array.size(); ++i) {
     if (plugin_prefs->IsPluginEnabled(info_array[i])) {
       flash_version = info_array[i].version;
       break;
     }
   }
   localized_strings->SetString("flash_plugin", "Flash");
@@ skipping 52 matching lines @@
   } else {
     localized_strings->SetString("profile_path",
         l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_PATH_NOTFOUND));
   }
 
   std::string data;
   jstemplate_builder::AppendJsonJS(localized_strings, &data);
   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
 // to a DictionaryValue. Fills ws_usage and comm_usage so that the objects
 // can be used in caller's scope (e.g for appending to a net total).
 void AboutMemoryHandler::BindProcessMetrics(DictionaryValue* data,
                                             ProcessMemoryInformation* info) {
   DCHECK(data && info);
 
   // Bind metrics to dictionary.
@@ skipping 210 matching lines @@
   } else if (host == chrome::kChromeUITermsHost) {
 #if defined(OS_CHROMEOS)
     ChromeOSTermsHandler::Start(this, path, request_id);
     return;
 #else
     response = ResourceBundle::GetSharedInstance().GetRawDataResource(
         IDR_TERMS_HTML).as_string();
 #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);
     }
   }
 
   FinishDataRequest(response, request_id);
 }
 
 void AboutSource::FinishDataRequest(const std::string& html, int request_id) {
   std::string html_copy(html);
@@ skipping 126 matching lines @@
   return false;
 }
 
 std::vector<std::string> ChromePaths() {
   std::vector<std::string> paths;
   paths.reserve(arraysize(kChromePaths));
   for (size_t i = 0; i < arraysize(kChromePaths); i++)
     paths.push_back(kChromePaths[i]);
   return paths;
 }