summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-30 18:08:36 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-30 18:08:36 +0000
commitac9ba8fe1d2f2397de3d7c4cebfb3c659d226fd3 (patch)
tree7118143b15fb701d5d91de270a1af7ea431eaa8a /chrome/browser
parentb8eeb3eeba2418d9a1a7bb8429ddd5ec592298c1 (diff)
downloadchromium_src-ac9ba8fe1d2f2397de3d7c4cebfb3c659d226fd3.zip
chromium_src-ac9ba8fe1d2f2397de3d7c4cebfb3c659d226fd3.tar.gz
chromium_src-ac9ba8fe1d2f2397de3d7c4cebfb3c659d226fd3.tar.bz2
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
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/jankometer.cc4
-rw-r--r--chrome/browser/printing/printing_layout_uitest.cc2
-rw-r--r--chrome/browser/renderer_host/render_message_filter.cc4
-rw-r--r--chrome/browser/ui/cocoa/keystone_glue.mm4
4 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/jankometer.cc b/chrome/browser/jankometer.cc
index ed4f9fd..a2f63c0 100644
--- a/chrome/browser/jankometer.cc
+++ b/chrome/browser/jankometer.cc
@@ -13,9 +13,9 @@
#include "base/metrics/stats_counters.h"
#include "base/ref_counted.h"
#include "base/string_util.h"
+#include "base/threading/watchdog.h"
#include "base/thread.h"
#include "base/time.h"
-#include "base/watchdog.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_thread.h"
@@ -55,7 +55,7 @@ const bool kPlaySounds = false;
//------------------------------------------------------------------------------
// Provide a special watchdog to make it easy to set the breakpoint on this
// class only.
-class JankWatchdog : public Watchdog {
+class JankWatchdog : public base::Watchdog {
public:
JankWatchdog(const TimeDelta& duration,
const std::string& thread_watched_name,
diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc
index 754e8f5..1198705 100644
--- a/chrome/browser/printing/printing_layout_uitest.cc
+++ b/chrome/browser/printing/printing_layout_uitest.cc
@@ -4,8 +4,8 @@
#include "base/command_line.h"
#include "base/file_util.h"
-#include "base/simple_thread.h"
#include "base/test/test_file_util.h"
+#include "base/threading/simple_thread.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/ui/ui_test.h"
#include "net/test/test_server.h"
diff --git a/chrome/browser/renderer_host/render_message_filter.cc b/chrome/browser/renderer_host/render_message_filter.cc
index b5adbaa..5f638ab 100644
--- a/chrome/browser/renderer_host/render_message_filter.cc
+++ b/chrome/browser/renderer_host/render_message_filter.cc
@@ -12,9 +12,9 @@
#include "base/process_util.h"
#include "base/shared_memory.h"
#include "base/sys_string_conversions.h"
+#include "base/threading/worker_pool.h"
#include "base/thread.h"
#include "base/utf_string_conversions.h"
-#include "base/worker_pool.h"
#include "chrome/browser/automation/automation_resource_message_filter.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_thread.h"
@@ -1352,7 +1352,7 @@ void RenderMessageFilter::OnKeygen(uint32 key_size_index,
VLOG(1) << "Dispatching keygen task to worker pool.";
// Dispatch to worker pool, so we do not block the IO thread.
- if (!WorkerPool::PostTask(
+ if (!base::WorkerPool::PostTask(
FROM_HERE,
NewRunnableMethod(
this, &RenderMessageFilter::OnKeygenOnWorkerThread,
diff --git a/chrome/browser/ui/cocoa/keystone_glue.mm b/chrome/browser/ui/cocoa/keystone_glue.mm
index b42375a..79e95fc 100644
--- a/chrome/browser/ui/cocoa/keystone_glue.mm
+++ b/chrome/browser/ui/cocoa/keystone_glue.mm
@@ -17,7 +17,7 @@
#include "base/sys_string_conversions.h"
#include "base/ref_counted.h"
#include "base/task.h"
-#include "base/worker_pool.h"
+#include "base/threading/worker_pool.h"
#include "chrome/browser/ui/cocoa/authorization_util.h"
#include "chrome/common/chrome_constants.h"
#include "grit/chromium_strings.h"
@@ -104,7 +104,7 @@ class PerformBridge : public base::RefCountedThreadSafe<PerformBridge> {
DCHECK(sel);
scoped_refptr<PerformBridge> op = new PerformBridge(target, sel, arg);
- WorkerPool::PostTask(
+ base::WorkerPool::PostTask(
FROM_HERE, NewRunnableMethod(op.get(), &PerformBridge::Run), true);
}