diff options
Diffstat (limited to 'net/disk_cache')
-rw-r--r-- | net/disk_cache/backend_unittest.cc | 14 | ||||
-rw-r--r-- | net/disk_cache/entry_unittest.cc | 12 | ||||
-rw-r--r-- | net/disk_cache/stress_cache.cc | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc index d3e79a1..4703460 100644 --- a/net/disk_cache/backend_unittest.cc +++ b/net/disk_cache/backend_unittest.cc @@ -4,10 +4,10 @@ #include "base/basictypes.h" #include "base/file_util.h" -#include "base/platform_thread.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" +#include "base/threading/platform_thread.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" @@ -877,7 +877,7 @@ void DiskCacheBackendTest::BackendEnumerations2() { entry2->Close(); // Make sure that the timestamp is not the same. - PlatformThread::Sleep(20); + base::PlatformThread::Sleep(20); ASSERT_EQ(net::OK, OpenEntry(second, &entry1)); void* iter = NULL; ASSERT_EQ(net::OK, OpenNextEntry(&iter, &entry2)); @@ -1053,7 +1053,7 @@ void DiskCacheBackendTest::BackendDoomRecent() { ASSERT_EQ(net::OK, CreateEntry("second", &entry)); entry->Close(); - PlatformThread::Sleep(20); + base::PlatformThread::Sleep(20); Time middle = Time::Now(); ASSERT_EQ(net::OK, CreateEntry("third", &entry)); @@ -1061,7 +1061,7 @@ void DiskCacheBackendTest::BackendDoomRecent() { ASSERT_EQ(net::OK, CreateEntry("fourth", &entry)); entry->Close(); - PlatformThread::Sleep(20); + base::PlatformThread::Sleep(20); Time final = Time::Now(); ASSERT_EQ(4, cache_->GetEntryCount()); @@ -1097,7 +1097,7 @@ void DiskCacheBackendTest::BackendDoomBetween() { ASSERT_EQ(net::OK, CreateEntry("first", &entry)); entry->Close(); - PlatformThread::Sleep(20); + base::PlatformThread::Sleep(20); Time middle_start = Time::Now(); ASSERT_EQ(net::OK, CreateEntry("second", &entry)); @@ -1105,7 +1105,7 @@ void DiskCacheBackendTest::BackendDoomBetween() { ASSERT_EQ(net::OK, CreateEntry("third", &entry)); entry->Close(); - PlatformThread::Sleep(20); + base::PlatformThread::Sleep(20); Time middle_end = Time::Now(); ASSERT_EQ(net::OK, CreateEntry("fourth", &entry)); @@ -1113,7 +1113,7 @@ void DiskCacheBackendTest::BackendDoomBetween() { ASSERT_EQ(net::OK, OpenEntry("fourth", &entry)); entry->Close(); - PlatformThread::Sleep(20); + base::PlatformThread::Sleep(20); Time final = Time::Now(); ASSERT_EQ(4, cache_->GetEntryCount()); diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc index cb7f680..21d5839 100644 --- a/net/disk_cache/entry_unittest.cc +++ b/net/disk_cache/entry_unittest.cc @@ -1,9 +1,9 @@ -// Copyright (c) 2006-2010 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/basictypes.h" -#include "base/platform_thread.h" +#include "base/threading/platform_thread.h" #include "base/timer.h" #include "base/string_util.h" #include "net/base/io_buffer.h" @@ -634,7 +634,7 @@ void DiskCacheEntryTest::GetTimes() { EXPECT_TRUE(entry->GetLastModified() >= t1); EXPECT_TRUE(entry->GetLastModified() == entry->GetLastUsed()); - PlatformThread::Sleep(20); + base::PlatformThread::Sleep(20); Time t2 = Time::Now(); EXPECT_TRUE(t2 > t1); EXPECT_EQ(0, WriteData(entry, 0, 200, NULL, 0, false)); @@ -645,7 +645,7 @@ void DiskCacheEntryTest::GetTimes() { } EXPECT_TRUE(entry->GetLastModified() == entry->GetLastUsed()); - PlatformThread::Sleep(20); + base::PlatformThread::Sleep(20); Time t3 = Time::Now(); EXPECT_TRUE(t3 > t2); const int kSize = 200; @@ -1286,7 +1286,7 @@ void DiskCacheEntryTest::DoomedEntry() { FlushQueueForTest(); EXPECT_EQ(0, cache_->GetEntryCount()); Time initial = Time::Now(); - PlatformThread::Sleep(20); + base::PlatformThread::Sleep(20); const int kSize1 = 2000; const int kSize2 = 2000; @@ -1746,7 +1746,7 @@ void DiskCacheEntryTest::DoomSparseEntry() { // Most likely we are waiting for the result of reading the sparse info // (it's always async on Posix so it is easy to miss). Unfortunately we // don't have any signal to watch for so we can only wait. - PlatformThread::Sleep(500); + base::PlatformThread::Sleep(500); MessageLoop::current()->RunAllPending(); } EXPECT_EQ(0, cache_->GetEntryCount()); diff --git a/net/disk_cache/stress_cache.cc b/net/disk_cache/stress_cache.cc index 6658dc8..41a98c9 100644 --- a/net/disk_cache/stress_cache.cc +++ b/net/disk_cache/stress_cache.cc @@ -32,10 +32,10 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/platform_thread.h" #include "base/process_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/threading/platform_thread.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "net/base/net_errors.h" @@ -228,7 +228,7 @@ int main(int argc, const char* argv[]) { logging::SetLogAssertHandler(CrashHandler); // Some time for the memory manager to flush stuff. - PlatformThread::Sleep(3000); + base::PlatformThread::Sleep(3000); MessageLoop message_loop(MessageLoop::TYPE_IO); char* end; |