Revert "content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs"

content/browser/plugin_service_impl.cc

 // 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.
 
 #include "content/browser/plugin_service_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
-#include "base/location.h"
+#include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
-#include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "content/browser/ppapi_plugin_process_host.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/common/content_switches_internal.h"
 #include "content/common/pepper_plugin_list.h"
 #include "content/common/plugin_list.h"
@@ skipping 94 matching lines @@
   VLOG(1) << "Watched path changed: " << path.value();
   // Make the plugin list update itself
   PluginList::Singleton()->RefreshPlugins();
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&PluginService::PurgePluginListCache,
                  static_cast<BrowserContext*>(NULL), false));
 }
 #endif
 
-void ForwardCallback(base::SingleThreadTaskRunner* target_task_runner,
+void ForwardCallback(base::MessageLoopProxy* target_loop,
                      const PluginService::GetPluginsCallback& callback,
                      const std::vector<WebPluginInfo>& plugins) {
-  target_task_runner->PostTask(FROM_HERE, base::Bind(callback, plugins));
+  target_loop->PostTask(FROM_HERE, base::Bind(callback, plugins));
 }
 
 }  // namespace
 
 // static
 PluginService* PluginService::GetInstance() {
   return PluginServiceImpl::GetInstance();
 }
 
 void PluginService::PurgePluginListCache(BrowserContext* browser_context,
@@ skipping 440 matching lines @@
     // terrible, so look for that and strip it off if present.
     const std::string kPluginExtension = ".plugin";
     if (EndsWith(plugin_name, base::ASCIIToUTF16(kPluginExtension), true))
       plugin_name.erase(plugin_name.length() - kPluginExtension.length());
 #endif  // OS_MACOSX
   }
   return plugin_name;
 }
 
 void PluginServiceImpl::GetPlugins(const GetPluginsCallback& callback) {
-  scoped_refptr<base::SingleThreadTaskRunner> target_task_runner(
-      base::ThreadTaskRunnerHandle::Get());
+  scoped_refptr<base::MessageLoopProxy> target_loop(
+      base::MessageLoop::current()->message_loop_proxy());
 
   if (LoadPluginListInProcess()) {
-    BrowserThread::GetBlockingPool()
-        ->PostSequencedWorkerTaskWithShutdownBehavior(
-            plugin_list_token_, FROM_HERE,
+    BrowserThread::GetBlockingPool()->
+        PostSequencedWorkerTaskWithShutdownBehavior(
+            plugin_list_token_,
+            FROM_HERE,
             base::Bind(&PluginServiceImpl::GetPluginsInternal,
-                       base::Unretained(this), target_task_runner, callback),
-            base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
+                       base::Unretained(this),
+                       target_loop, callback),
+        base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
     return;
   }
 #if defined(OS_POSIX)
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&PluginServiceImpl::GetPluginsOnIOThread,
-                 base::Unretained(this), target_task_runner, callback));
+                 base::Unretained(this), target_loop, callback));
 #else
   NOTREACHED();
 #endif
 }
 
 void PluginServiceImpl::GetPluginsInternal(
-    base::SingleThreadTaskRunner* target_task_runner,
-    const PluginService::GetPluginsCallback& callback) {
+     base::MessageLoopProxy* target_loop,
+     const PluginService::GetPluginsCallback& callback) {
   DCHECK(BrowserThread::GetBlockingPool()->IsRunningSequenceOnCurrentThread(
       plugin_list_token_));
 
   std::vector<WebPluginInfo> plugins;
   PluginList::Singleton()->GetPlugins(&plugins, NPAPIPluginsSupported());
 
-  target_task_runner->PostTask(FROM_HERE, base::Bind(callback, plugins));
+  target_loop->PostTask(FROM_HERE,
+      base::Bind(callback, plugins));
 }
 
 #if defined(OS_POSIX)
 void PluginServiceImpl::GetPluginsOnIOThread(
-    base::SingleThreadTaskRunner* target_task_runner,
+    base::MessageLoopProxy* target_loop,
     const GetPluginsCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // If we switch back to loading plugins in process, then we need to make
   // sure g_thread_init() gets called since plugins may call glib at load.
 
   if (!plugin_loader_.get())
     plugin_loader_ = new PluginLoaderPosix;
 
-  plugin_loader_->GetPlugins(base::Bind(
-      &ForwardCallback, make_scoped_refptr(target_task_runner), callback));
+  plugin_loader_->GetPlugins(
+      base::Bind(&ForwardCallback, make_scoped_refptr(target_loop), callback));
 }
 #endif
 
 #if defined(OS_WIN)
 void PluginServiceImpl::OnKeyChanged(base::win::RegKey* key) {
   key->StartWatching(base::Bind(&PluginServiceImpl::OnKeyChanged,
                                 base::Unretained(this),
                                 base::Unretained(key)));
 
   PluginList::Singleton()->RefreshPlugins();
@@ skipping 220 matching lines @@
 #endif
 
 bool PluginServiceImpl::PpapiDevChannelSupported(
     BrowserContext* browser_context,
     const GURL& document_url) {
   return content::GetContentClient()->browser()->
       IsPluginAllowedToUseDevChannelAPIs(browser_context, document_url);
 }
 
 }  // namespace content