summaryrefslogtreecommitdiffstats
path: root/base/waitable_event_unittest.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-31 20:02:16 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-31 20:02:16 +0000
commitce072a7181ea5d58133e33654133236f5d9f5551 (patch)
tree1b1c903fec3fd27038cd17cb4ae9ca17d3736e40 /base/waitable_event_unittest.cc
parenta8e2058011129cbef38bf89834ee01715556b392 (diff)
downloadchromium_src-ce072a7181ea5d58133e33654133236f5d9f5551.zip
chromium_src-ce072a7181ea5d58133e33654133236f5d9f5551.tar.gz
chromium_src-ce072a7181ea5d58133e33654133236f5d9f5551.tar.bz2
Move platform_thread to base/threading and put in the base namespace. I left a
stub and "using" declarations in the old location to avoid having to change the entire project at once. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/6001010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/waitable_event_unittest.cc')
-rw-r--r--base/waitable_event_unittest.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/base/waitable_event_unittest.cc b/base/waitable_event_unittest.cc
index b2590a8..b4f1991 100644
--- a/base/waitable_event_unittest.cc
+++ b/base/waitable_event_unittest.cc
@@ -1,10 +1,10 @@
-// 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.
#include "base/time.h"
#include "base/waitable_event.h"
-#include "base/platform_thread.h"
+#include "base/threading/platform_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
using base::TimeDelta;
@@ -74,7 +74,7 @@ TEST(WaitableEventTest, WaitManyShortcut) {
delete ev[i];
}
-class WaitableEventSignaler : public PlatformThread::Delegate {
+class WaitableEventSignaler : public base::PlatformThread::Delegate {
public:
WaitableEventSignaler(double seconds, WaitableEvent* ev)
: seconds_(seconds),
@@ -82,7 +82,7 @@ class WaitableEventSignaler : public PlatformThread::Delegate {
}
void ThreadMain() {
- PlatformThread::Sleep(static_cast<int>(seconds_ * 1000));
+ base::PlatformThread::Sleep(static_cast<int>(seconds_ * 1000));
ev_->Signal();
}
@@ -97,12 +97,12 @@ TEST(WaitableEventTest, WaitMany) {
ev[i] = new WaitableEvent(false, false);
WaitableEventSignaler signaler(0.1, ev[2]);
- PlatformThreadHandle thread;
- PlatformThread::Create(0, &signaler, &thread);
+ base::PlatformThreadHandle thread;
+ base::PlatformThread::Create(0, &signaler, &thread);
EXPECT_EQ(WaitableEvent::WaitMany(ev, 5), 2u);
- PlatformThread::Join(thread);
+ base::PlatformThread::Join(thread);
for (unsigned i = 0; i < 5; ++i)
delete ev[i];