summaryrefslogtreecommitdiffstats
path: root/content/worker
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-27 18:04:56 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-27 18:04:56 +0000
commit89bf27e34e49c271aa958c1795d5bccad0e63f88 (patch)
treef971f9282a07dbb991a079daade728830df3da2d /content/worker
parentaa0ec7b63637a5917ce4be9a0e6cceb26b7a3298 (diff)
downloadchromium_src-89bf27e34e49c271aa958c1795d5bccad0e63f88.zip
chromium_src-89bf27e34e49c271aa958c1795d5bccad0e63f88.tar.gz
chromium_src-89bf27e34e49c271aa958c1795d5bccad0e63f88.tar.bz2
Move timing files into base/time and base/timer, install forwarding headers.
BUG=254986 TEST=none TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/18063004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208951 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
-rw-r--r--content/worker/worker_main.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/worker/worker_main.cc b/content/worker/worker_main.cc
index a95bae4..e1dfbc5 100644
--- a/content/worker/worker_main.cc
+++ b/content/worker/worker_main.cc
@@ -4,11 +4,11 @@
#include "base/base_switches.h"
#include "base/command_line.h"
-#include "base/hi_res_timer_manager.h"
#include "base/message_loop.h"
#include "base/power_monitor/power_monitor.h"
#include "base/strings/string_util.h"
#include "base/threading/platform_thread.h"
+#include "base/timer/hi_res_timer_manager.h"
#include "content/child/child_process.h"
#include "content/common/sandbox_linux.h"
#include "content/public/common/main_function_params.h"
@@ -32,7 +32,7 @@ int WorkerMain(const MainFunctionParams& parameters) {
base::PlatformThread::SetName("CrWorkerMain");
base::PowerMonitor power_monitor;
- HighResolutionTimerManager hi_res_timer_manager;
+ base::HighResolutionTimerManager hi_res_timer_manager;
#if defined(OS_WIN)
sandbox::TargetServices* target_services =