Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 18 insertions, 0 deletions

diff --git a/base/worker_pool_linux.cc b/base/worker_pool_linux.cc
index 2aa1df2..8c96ca0 100644
--- a/base/worker_pool_linux.cc
+++ b/base/worker_pool_linux.cc
@@ -84,11 +84,29 @@ void WorkerThread::ThreadMain() {
 
 }  // namespace
 
+// NOTE(shess): Temporarily allow the Mac WorkerPool implementation to
+// call into the linux so that it can provide a command-line flag for
+// switching back and forth.  After evaluating, either remove the
+// ifdef, or shift this to a shared POSIX implementation.
+// http://crbug.com/44392
+#if defined(OS_MACOSX)
+namespace worker_pool_mac {
+
+bool MacPostTaskHelper(const tracked_objects::Location& from_here,
+                       Task* task, bool task_is_slow) {
+  g_lazy_worker_pool.Pointer()->PostTask(from_here, task, task_is_slow);
+  return true;
+}
+
+}  // namespace worker_pool_mac
+
+#else
 bool WorkerPool::PostTask(const tracked_objects::Location& from_here,
                           Task* task, bool task_is_slow) {
   g_lazy_worker_pool.Pointer()->PostTask(from_here, task, task_is_slow);
   return true;
 }
+#endif
 
 namespace base {