Move some misc thread-related stuff from base to base/thread and into the base

namespace. This does not move the "hard" thread stuff (thread.h).

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6079009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70315 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 31 insertions, 31 deletions

diff --git a/net/base/cert_verifier.cc b/net/base/cert_verifier.cc
index 4b3d904..3d22dec 100644
--- a/net/base/cert_verifier.cc
+++ b/net/base/cert_verifier.cc
@@ -8,7 +8,7 @@
 #include "base/lock.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
-#include "base/worker_pool.h"
+#include "base/threading/worker_pool.h"
 #include "net/base/net_errors.h"
 #include "net/base/x509_certificate.h"
 
@@ -136,9 +136,9 @@ class CertVerifierWorker {
   bool Start() {
     DCHECK_EQ(MessageLoop::current(), origin_loop_);
 
-    return WorkerPool::PostTask(
-               FROM_HERE, NewRunnableMethod(this, &CertVerifierWorker::Run),
-               true /* task is slow */);
+    return base::WorkerPool::PostTask(
+        FROM_HERE, NewRunnableMethod(this, &CertVerifierWorker::Run),
+        true /* task is slow */);
   }
 
   // Cancel is called from the origin loop when the CertVerifier is getting
diff --git a/net/base/dnsrr_resolver.cc b/net/base/dnsrr_resolver.cc
index 30031f3..393c213 100644
--- a/net/base/dnsrr_resolver.cc
+++ b/net/base/dnsrr_resolver.cc
@@ -15,7 +15,7 @@
 #include "base/stl_util-inl.h"
 #include "base/string_piece.h"
 #include "base/task.h"
-#include "base/worker_pool.h"
+#include "base/threading/worker_pool.h"
 #include "net/base/dns_reload_timer.h"
 #include "net/base/dns_util.h"
 #include "net/base/net_errors.h"
@@ -139,9 +139,9 @@ class RRResolverWorker {
   bool Start() {
     DCHECK_EQ(MessageLoop::current(), origin_loop_);
 
-    return WorkerPool::PostTask(
-               FROM_HERE, NewRunnableMethod(this, &RRResolverWorker::Run),
-               true /* task is slow */);
+    return base::WorkerPool::PostTask(
+        FROM_HERE, NewRunnableMethod(this, &RRResolverWorker::Run),
+        true /* task is slow */);
   }
 
   // Cancel is called from the origin loop when the DnsRRResolver is getting
diff --git a/net/base/file_stream_posix.cc b/net/base/file_stream_posix.cc
index 1e20efe..887d9c1 100644
--- a/net/base/file_stream_posix.cc
+++ b/net/base/file_stream_posix.cc
@@ -21,8 +21,8 @@
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
+#include "base/threading/worker_pool.h"
 #include "base/waitable_event.h"
-#include "base/worker_pool.h"
 #include "net/base/net_errors.h"
 
 // We cast back and forth, so make sure it's the size we're expecting.
@@ -250,11 +250,11 @@ void FileStream::AsyncContext::InitiateAsyncRead(
   DCHECK(!callback_);
   callback_ = callback;
 
-  WorkerPool::PostTask(FROM_HERE,
-                       new BackgroundReadTask(
-                           file, buf, buf_len,
-                           &background_io_completed_callback_),
-                       true /* task_is_slow */);
+  base::WorkerPool::PostTask(FROM_HERE,
+                             new BackgroundReadTask(
+                                 file, buf, buf_len,
+                                 &background_io_completed_callback_),
+                             true /* task_is_slow */);
 }
 
 void FileStream::AsyncContext::InitiateAsyncWrite(
@@ -263,11 +263,11 @@ void FileStream::AsyncContext::InitiateAsyncWrite(
   DCHECK(!callback_);
   callback_ = callback;
 
-  WorkerPool::PostTask(FROM_HERE,
-                       new BackgroundWriteTask(
-                           file, buf, buf_len,
-                           &background_io_completed_callback_),
-                       true /* task_is_slow */);
+  base::WorkerPool::PostTask(FROM_HERE,
+                             new BackgroundWriteTask(
+                                 file, buf, buf_len,
+                                 &background_io_completed_callback_),
+                             true /* task_is_slow */);
 }
 
 void FileStream::AsyncContext::OnBackgroundIOCompleted(int result) {
diff --git a/net/base/host_resolver_impl.cc b/net/base/host_resolver_impl.cc
index b53ec6d..6e4637c 100644
--- a/net/base/host_resolver_impl.cc
+++ b/net/base/host_resolver_impl.cc
@@ -24,10 +24,10 @@
 #include "base/metrics/histogram.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
+#include "base/threading/worker_pool.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "base/worker_pool.h"
 #include "net/base/address_list.h"
 #include "net/base/address_list_net_log_param.h"
 #include "net/base/host_port_pair.h"
@@ -382,7 +382,7 @@ class HostResolverImpl::Job
     start_time_ = base::TimeTicks::Now();
 
     // Dispatch the job to a worker thread.
-    if (!WorkerPool::PostTask(FROM_HERE,
+    if (!base::WorkerPool::PostTask(FROM_HERE,
             NewRunnableMethod(this, &Job::DoLookup), true)) {
       NOTREACHED();
 
@@ -650,7 +650,7 @@ class HostResolverImpl::IPv6ProbeJob
       return;
     DCHECK(IsOnOriginThread());
     const bool kIsSlow = true;
-    WorkerPool::PostTask(
+    base::WorkerPool::PostTask(
         FROM_HERE, NewRunnableMethod(this, &IPv6ProbeJob::DoProbe), kIsSlow);
   }
 
diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc
index f4251f2..10ccc95 100644
--- a/net/base/keygen_handler_unittest.cc
+++ b/net/base/keygen_handler_unittest.cc
@@ -11,9 +11,9 @@
 #include "base/logging.h"
 #include "base/nss_util.h"
 #include "base/task.h"
+#include "base/threading/worker_pool.h"
 #include "base/thread_restrictions.h"
 #include "base/waitable_event.h"
-#include "base/worker_pool.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(USE_NSS)
@@ -124,10 +124,10 @@ TEST_F(KeygenHandlerTest, ConcurrencyTest) {
   std::string results[NUM_HANDLERS];
   for (int i = 0; i < NUM_HANDLERS; i++) {
     events[i] = new base::WaitableEvent(false, false);
-    WorkerPool::PostTask(FROM_HERE,
-                         new ConcurrencyTestTask(events[i], "some challenge",
-                                                 &results[i]),
-                         true);
+    base::WorkerPool::PostTask(
+        FROM_HERE,
+        new ConcurrencyTestTask(events[i], "some challenge", &results[i]),
+        true);
   }
 
   for (int i = 0; i < NUM_HANDLERS; i++) {
diff --git a/net/base/test_completion_callback_unittest.cc b/net/base/test_completion_callback_unittest.cc
index c19aae0..a0ae9bf 100644
--- a/net/base/test_completion_callback_unittest.cc
+++ b/net/base/test_completion_callback_unittest.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
 // Illustrates how to use worker threads that issue completion callbacks
 
-#include "testing/gtest/include/gtest/gtest.h"
+#include "base/threading/worker_pool.h"
 #include "net/base/completion_callback.h"
 #include "net/base/test_completion_callback.h"
-#include "base/worker_pool.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 typedef PlatformTest TestCompletionCallbackTest;
@@ -102,7 +102,7 @@ bool ExampleEmployer::DoSomething(CompletionCallback* callback) {
   request_ = new ExampleWorker(this, callback);
 
   // Dispatch to worker thread...
-  if (!WorkerPool::PostTask(FROM_HERE,
+  if (!base::WorkerPool::PostTask(FROM_HERE,
           NewRunnableMethod(request_.get(), &ExampleWorker::DoWork), true)) {
     NOTREACHED();
     request_ = NULL;