summaryrefslogtreecommitdiffstats
path: root/base/stats_table_unittest.cc
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-14 03:25:15 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-14 03:25:15 +0000
commit176aa48371da91eb98d675d87b4e70c7b26d696f (patch)
tree4c972de6ecd5a54650ab1dc7d421187f5d25834f /base/stats_table_unittest.cc
parent9a3f0ac2899139ace97e399015259d028b4d5704 (diff)
downloadchromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.zip
chromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.tar.gz
chromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.tar.bz2
Add Terminate() to the Process object, have RenderProcessHost use this to avoid some more Windows specific code.
Move Process and SharedMemory into the base namespace (most changes). Review URL: http://codereview.chromium.org/10895 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/stats_table_unittest.cc')
-rw-r--r--base/stats_table_unittest.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/base/stats_table_unittest.cc b/base/stats_table_unittest.cc
index 0ce99b7..68a07ac 100644
--- a/base/stats_table_unittest.cc
+++ b/base/stats_table_unittest.cc
@@ -16,9 +16,8 @@
#include <windows.h>
#endif
-using base::TimeTicks;
+namespace base {
-namespace {
class StatsTableTest : public MultiProcessTest {
};
@@ -199,7 +198,7 @@ TEST_F(StatsTableTest, MultipleProcesses) {
// Wait for the processes to finish.
for (int index = 0; index < kMaxProcs; index++) {
- EXPECT_TRUE(process_util::WaitForSingleProcess(procs[index], 60 * 1000));
+ EXPECT_TRUE(WaitForSingleProcess(procs[index], 60 * 1000));
}
StatsCounter zero_counter(kCounterZero);
@@ -381,4 +380,4 @@ TEST_F(StatsTableTest, StatsScope) {
EXPECT_EQ(2, table.GetCounterValue(L"c:bar"));
}
-} // namespace
+} // namespace base