diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 02:17:08 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 02:17:08 +0000 |
| commit | f214f8797150f49e1233110c1dafe4e8b601d9ea (patch) | |
| tree | 191f4f5b9ee1d9c20fc02dd4f1c940ad4d04267c /ipc | |
| parent | 34b9963c187a733bef76535521f3de688fffd34f (diff) | |
| download | chromium_src-f214f8797150f49e1233110c1dafe4e8b601d9ea.zip chromium_src-f214f8797150f49e1233110c1dafe4e8b601d9ea.tar.gz chromium_src-f214f8797150f49e1233110c1dafe4e8b601d9ea.tar.bz2 | |
Remove base/platform_thread.h stub and fix up all callers to use the new location and namespace.
TEST=none
BUG=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_fuzzing_tests.cc | 8 | ||||
| -rw-r--r-- | ipc/ipc_sync_channel_unittest.cc | 4 | ||||
| -rw-r--r-- | ipc/sync_socket_unittest.cc | 15 |
3 files changed, 12 insertions, 15 deletions
diff --git a/ipc/ipc_fuzzing_tests.cc b/ipc/ipc_fuzzing_tests.cc index 5dd916f..7c96587 100644 --- a/ipc/ipc_fuzzing_tests.cc +++ b/ipc/ipc_fuzzing_tests.cc @@ -7,8 +7,8 @@ #include <sstream> #include "base/message_loop.h" -#include "base/platform_thread.h" #include "base/process_util.h" +#include "base/threading/platform_thread.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_message_utils.h" @@ -288,7 +288,7 @@ TEST_F(IPCFuzzingTest, SanityTest) { &listener); base::ProcessHandle server_process = SpawnChild(FUZZER_SERVER, &chan); ASSERT_TRUE(server_process); - PlatformThread::Sleep(1000); + base::PlatformThread::Sleep(1000); ASSERT_TRUE(chan.Connect()); listener.Init(&chan); @@ -318,7 +318,7 @@ TEST_F(IPCFuzzingTest, MsgBadPayloadShort) { &listener); base::ProcessHandle server_process = SpawnChild(FUZZER_SERVER, &chan); ASSERT_TRUE(server_process); - PlatformThread::Sleep(1000); + base::PlatformThread::Sleep(1000); ASSERT_TRUE(chan.Connect()); listener.Init(&chan); @@ -348,7 +348,7 @@ TEST_F(IPCFuzzingTest, MsgBadPayloadArgs) { &listener); base::ProcessHandle server_process = SpawnChild(FUZZER_SERVER, &chan); ASSERT_TRUE(server_process); - PlatformThread::Sleep(1000); + base::PlatformThread::Sleep(1000); ASSERT_TRUE(chan.Connect()); listener.Init(&chan); diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc index 32969a3..b713c0a 100644 --- a/ipc/ipc_sync_channel_unittest.cc +++ b/ipc/ipc_sync_channel_unittest.cc @@ -12,11 +12,11 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/platform_thread.h" #include "base/scoped_ptr.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" +#include "base/threading/platform_thread.h" #include "base/threading/thread.h" #include "base/waitable_event.h" #include "ipc/ipc_message.h" @@ -1011,7 +1011,7 @@ class NestedTask : public Task { explicit NestedTask(Worker* server) : server_(server) { } void Run() { // Sleep a bit so that we wake up after the reply has been received. - PlatformThread::Sleep(250); + base::PlatformThread::Sleep(250); server_->SendAnswerToLife(true, base::kNoTimeout, true); } diff --git a/ipc/sync_socket_unittest.cc b/ipc/sync_socket_unittest.cc index 3598cf3..4b2dd13 100644 --- a/ipc/sync_socket_unittest.cc +++ b/ipc/sync_socket_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 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. @@ -9,23 +9,20 @@ #include <sstream> #include "base/message_loop.h" -#if defined(OS_LINUX) || defined(OS_MACOSX) -#include "base/file_descriptor_posix.h" -#endif // defined(OS_LINUX) || defined(OS_MACOSX) -#include "base/platform_thread.h" #include "base/process_util.h" +#include "build/build_config.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_channel_proxy.h" +#include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_utils.h" #include "ipc/ipc_message_utils_impl.h" #include "ipc/ipc_tests.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/multiprocess_func_list.h" - -// We don't actually use the messages defined in this file, but we do this -// to get to the IPC macros. -#include "ipc/ipc_sync_message_unittest.h" +#if defined(OS_LINUX) || defined(OS_MACOSX) +#include "base/file_descriptor_posix.h" +#endif // defined(OS_LINUX) || defined(OS_MACOSX) enum IPCMessageIds { UNUSED_IPC_TYPE, |