summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
Diffstat (limited to 'ipc')
-rw-r--r--ipc/ipc_channel_unittest.cc5
-rw-r--r--ipc/ipc_perftests.cc7
-rw-r--r--ipc/ipc_test_base.cc14
3 files changed, 3 insertions, 23 deletions
diff --git a/ipc/ipc_channel_unittest.cc b/ipc/ipc_channel_unittest.cc
index bb7403f..cc7136d 100644
--- a/ipc/ipc_channel_unittest.cc
+++ b/ipc/ipc_channel_unittest.cc
@@ -15,13 +15,8 @@
#include <string>
#include <utility>
-#include "base/base_switches.h"
#include "base/command_line.h"
-#include "base/debug/debug_on_start_win.h"
-#include "base/perftimer.h"
#include "base/pickle.h"
-#include "base/test/perf_test_suite.h"
-#include "base/test/test_suite.h"
#include "base/threading/thread.h"
#include "base/time.h"
#include "ipc/ipc_descriptors.h"
diff --git a/ipc/ipc_perftests.cc b/ipc/ipc_perftests.cc
index 5b563d1..d6473cb 100644
--- a/ipc/ipc_perftests.cc
+++ b/ipc/ipc_perftests.cc
@@ -11,18 +11,13 @@
#include <unistd.h>
#endif
-#include <stdio.h>
#include <string>
-#include <utility>
-
-#include "ipc/ipc_test_base.h"
#include "base/base_switches.h"
#include "base/command_line.h"
#include "base/debug/debug_on_start_win.h"
#include "base/perftimer.h"
#include "base/pickle.h"
-#include "base/test/perf_test_suite.h"
#include "base/threading/thread.h"
#include "base/time.h"
#include "ipc/ipc_descriptors.h"
@@ -31,7 +26,7 @@
#include "ipc/ipc_message_utils.h"
#include "ipc/ipc_multiprocess_test.h"
#include "ipc/ipc_sender.h"
-#include "ipc/ipc_switches.h"
+#include "ipc/ipc_test_base.h"
#include "testing/multiprocess_func_list.h"
namespace {
diff --git a/ipc/ipc_test_base.cc b/ipc/ipc_test_base.cc
index 2d68a76..7c4fc5a 100644
--- a/ipc/ipc_test_base.cc
+++ b/ipc/ipc_test_base.cc
@@ -11,19 +11,12 @@
#include <unistd.h>
#endif
-#include <stdio.h>
-#include <string>
#include <utility>
#include "ipc/ipc_test_base.h"
-#include "base/base_switches.h"
#include "base/command_line.h"
#include "base/debug/debug_on_start_win.h"
-#include "base/perftimer.h"
-#include "base/pickle.h"
-#include "base/test/perf_test_suite.h"
-#include "base/test/test_suite.h"
#include "base/threading/thread.h"
#include "base/time.h"
#include "ipc/ipc_descriptors.h"
@@ -35,9 +28,6 @@
#include "ipc/ipc_switches.h"
#include "testing/multiprocess_func_list.h"
-// Define to enable IPC performance testing instead of the regular unit tests
-// #define PERFORMANCE_TEST
-
const char kTestClientChannel[] = "T1";
const char kReflectorChannel[] = "T2";
const char kFuzzerChannel[] = "F3";
@@ -59,7 +49,7 @@ void IPCTestBase::TearDown() {
#if defined(OS_WIN)
base::ProcessHandle IPCTestBase::SpawnChild(IPCTestBase::ChildType child_type,
- IPC::Channel *channel) {
+ IPC::Channel* channel) {
// kDebugChildren support.
bool debug_on_start =
CommandLine::ForCurrentProcess()->HasSwitch(switches::kDebugChildren);
@@ -79,7 +69,7 @@ base::ProcessHandle IPCTestBase::SpawnChild(IPCTestBase::ChildType child_type,
}
#elif defined(OS_POSIX)
base::ProcessHandle IPCTestBase::SpawnChild(IPCTestBase::ChildType child_type,
- IPC::Channel *channel) {
+ IPC::Channel* channel) {
// kDebugChildren support.
bool debug_on_start =
CommandLine::ForCurrentProcess()->HasSwitch(switches::kDebugChildren);