diff options
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/ipc.gyp | 1 | ||||
-rw-r--r-- | ipc/ipc_send_fds_test.cc | 1 | ||||
-rw-r--r-- | ipc/ipc_tests.cc | 2 | ||||
-rw-r--r-- | ipc/ipc_tests.h | 10 |
4 files changed, 6 insertions, 8 deletions
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp index ebc590a..69da83b 100644 --- a/ipc/ipc.gyp +++ b/ipc/ipc.gyp @@ -38,7 +38,6 @@ 'ipc', '../base/base.gyp:base', '../base/base.gyp:base_i18n', - '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', ], 'include_dirs': [ diff --git a/ipc/ipc_send_fds_test.cc b/ipc/ipc_send_fds_test.cc index 925eb5d..5f399da 100644 --- a/ipc/ipc_send_fds_test.cc +++ b/ipc/ipc_send_fds_test.cc @@ -18,7 +18,6 @@ extern "C" { #include "base/message_loop.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_message_utils.h" -#include "testing/multiprocess_func_list.h" #if defined(OS_POSIX) diff --git a/ipc/ipc_tests.cc b/ipc/ipc_tests.cc index 90be687..6118e58 100644 --- a/ipc/ipc_tests.cc +++ b/ipc/ipc_tests.cc @@ -536,7 +536,7 @@ int main(int argc, char** argv) { #ifdef PERFORMANCE_TEST int retval = PerfTestSuite(argc, argv).Run(); #else - int retval = base::TestSuite(argc, argv).Run(); + int retval = TestSuite(argc, argv).Run(); #endif return retval; } diff --git a/ipc/ipc_tests.h b/ipc/ipc_tests.h index bfefb4c..09a5ab8 100644 --- a/ipc/ipc_tests.h +++ b/ipc/ipc_tests.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef IPC_IPC_TESTS_H_ -#define IPC_IPC_TESTS_H_ +#ifndef IPC_IPC_TESTS_H__ +#define IPC_IPC_TESTS_H__ #pragma once -#include "base/test/multiprocess_test.h" +#include "base/multiprocess_test.h" #include "base/process.h" // This unit test uses 3 types of child processes, a regular pipe client, @@ -32,7 +32,7 @@ class Channel; } // namespace IPC //Base class to facilitate Spawning IPC Client processes. -class IPCChannelTest : public base::MultiProcessTest { +class IPCChannelTest : public MultiProcessTest { protected: // Create a new MessageLoopForIO For each test. @@ -46,4 +46,4 @@ class IPCChannelTest : public base::MultiProcessTest { MessageLoopForIO* message_loop_; }; -#endif // IPC_IPC_TESTS_H_ +#endif // IPC_IPC_TESTS_H__ |