Finish moving plugin probing out of process.

chrome/browser/plugin_data_remover_helper.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/plugin_data_remover_helper.h"
 
 #include <string>
 
 #include "base/bind.h"
+#include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/plugin_data_remover.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/browser_thread.h"
+#include "content/browser/plugin_service.h"
 #include "content/common/notification_service.h"
 
 // The internal class is refcounted so it can outlive PluginDataRemoverHelper.
+// TODO(bauerb): Replace with a WeakPtrFactory now that plugin callbacks run on
+// the UI thread.
 class PluginDataRemoverHelper::Internal
     : public base::RefCountedThreadSafe<PluginDataRemoverHelper::Internal> {
  public:
   Internal(const char* pref_name, Profile* profile)
       : pref_name_(pref_name), profile_(profile) {}
 
   void StartUpdate() {
-    BrowserThread::PostTask(
-        BrowserThread::FILE,
-        FROM_HERE,
-        base::Bind(&PluginDataRemoverHelper::Internal::UpdateOnFileThread,
-                   this,
-                   make_scoped_refptr(PluginPrefs::GetForProfile(profile_))));
+    PluginService::GetInstance()->GetPlugins(
+        base::Bind(&PluginDataRemoverHelper::Internal::GotPlugins, this,
+            make_scoped_refptr(PluginPrefs::GetForProfile(profile_))));
   }
 
   void Invalidate() {
     profile_ = NULL;
   }
 
  private:
   friend class base::RefCountedThreadSafe<Internal>;
 
   ~Internal() {}
 
-  void UpdateOnFileThread(scoped_refptr<PluginPrefs> plugin_prefs) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  void GotPlugins(scoped_refptr<PluginPrefs> plugin_prefs,
+                  const std::vector<webkit::WebPluginInfo>& plugins) {
     bool result = PluginDataRemover::IsSupported(plugin_prefs);
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&PluginDataRemoverHelper::Internal::SetPrefOnUIThread,
                    this,
                    result));
   }
 
   void SetPrefOnUIThread(bool value) {
@@ skipping 29 matching lines @@
 
 void PluginDataRemoverHelper::Observe(int type,
                                       const NotificationSource& source,
                                       const NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PLUGIN_ENABLE_STATUS_CHANGED) {
     internal_->StartUpdate();
   } else {
     NOTREACHED();
   }
 }