Ensure we don't load plugins on the IO thread

chrome/browser/metrics/metrics_service.cc

 // Copyright (c) 2006-2009 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.
 
 
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
@@ skipping 163 matching lines @@
 #include "base/platform_thread.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/memory_details.h"
-#include "chrome/browser/plugin_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/child_process_info.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/histogram_synchronizer.h"
 #include "chrome/common/libxml_utils.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/render_messages.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
+#include "webkit/glue/plugins/plugin_list.h"
 
 #if defined(OS_POSIX)
 // TODO(port): Move these headers above as they are ported.
 #include "chrome/common/temp_scaffolding_stubs.h"
 #else
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_settings.h"
 #endif
 
 using base::Time;
@@ skipping 71 matching lines @@
   virtual void OnDetailsAvailable() {
     MessageLoop::current()->PostTask(FROM_HERE, completion_);
   }
 
  private:
   Task* completion_;
   DISALLOW_EVIL_CONSTRUCTORS(MetricsMemoryDetails);
 };
 
 class MetricsService::GetPluginListTaskComplete : public Task {
+ public:
+  explicit GetPluginListTaskComplete(
+      const std::vector<WebPluginInfo>& plugins) : plugins_(plugins) { }
   virtual void Run() {
-    g_browser_process->metrics_service()->OnGetPluginListTaskComplete();
+    g_browser_process->metrics_service()->OnGetPluginListTaskComplete(plugins_);
   }
+
+ private:
+  std::vector<WebPluginInfo> plugins_;
 };
 
 class MetricsService::GetPluginListTask : public Task {
  public:
   explicit GetPluginListTask(MessageLoop* callback_loop)
       : callback_loop_(callback_loop) {}
 
   virtual void Run() {
     std::vector<WebPluginInfo> plugins;
-    PluginService::GetInstance()->GetPlugins(false, &plugins);
+    NPAPI::PluginList::Singleton()->GetPlugins(false, &plugins);
 
-    callback_loop_->PostTask(FROM_HERE, new GetPluginListTaskComplete());
+    callback_loop_->PostTask(
+        FROM_HERE, new GetPluginListTaskComplete(plugins));
   }
 
  private:
   MessageLoop* callback_loop_;
 };
 
 // static
 void MetricsService::RegisterPrefs(PrefService* local_state) {
   DCHECK(IsSingleThreaded());
   local_state->RegisterStringPref(prefs::kMetricsClientID, L"");
@@ skipping 428 matching lines @@
   UMA_HISTOGRAM_COUNTS_100("Chrome.CommandLineFlagCount",
                            command_line->GetSwitchCount());
   UMA_HISTOGRAM_COUNTS_100("Chrome.CommandLineUncommonFlagCount",
                            command_line->GetSwitchCount() - common_commands);
 
   // Kick off the process of saving the state (so the uptime numbers keep
   // getting updated) every n minutes.
   ScheduleNextStateSave();
 }
 
-void MetricsService::OnGetPluginListTaskComplete() {
+void MetricsService::OnGetPluginListTaskComplete(
+    const std::vector<WebPluginInfo>& plugins) {
   DCHECK(state_ == PLUGIN_LIST_REQUESTED);
+  plugins_ = plugins;
   if (state_ == PLUGIN_LIST_REQUESTED)
     state_ = PLUGIN_LIST_ARRIVED;
 }
 
 std::string MetricsService::GenerateClientID() {
 #if defined(OS_WIN)
   const int kGUIDSize = 39;
 
   GUID guid;
   HRESULT guid_result = CoCreateGuid(&guid);
@@ skipping 349 matching lines @@
       return true;
 
     case SENDING_CURRENT_LOGS:
     default:
       return false;
   }
 }
 
 void MetricsService::PrepareInitialLog() {
   DCHECK(state_ == PLUGIN_LIST_ARRIVED);
-  std::vector<WebPluginInfo> plugins;
-  PluginService::GetInstance()->GetPlugins(false, &plugins);
 
   MetricsLog* log = new MetricsLog(client_id_, session_id_);
-  log->RecordEnvironment(plugins, profile_dictionary_.get());
+  log->RecordEnvironment(plugins_, profile_dictionary_.get());
 
   // Histograms only get written to current_log_, so setup for the write.
   MetricsLog* save_log = current_log_;
   current_log_ = log;
   RecordCurrentHistograms();  // Into current_log_... which is really log.
   current_log_ = save_log;
 
   log->CloseLog();
   DCHECK(!pending_log());
   pending_log_ = log;
@@ skipping 784 matching lines @@
       L"." + key;
   prof_prefs->SetInteger(pref_key.c_str(), value);
 }
 
 static bool IsSingleThreaded() {
   static PlatformThreadId thread_id = 0;
   if (!thread_id)
     thread_id = PlatformThread::CurrentId();
   return PlatformThread::CurrentId() == thread_id;
 }