summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
Diffstat (limited to 'net/base')
-rw-r--r--net/base/bzip2_filter_unittest.cc2
-rw-r--r--net/base/file_stream_unittest.cc2
-rw-r--r--net/base/gzip_filter_unittest.cc2
-rw-r--r--net/base/listen_socket_unittest.cc2
-rw-r--r--net/base/ssl_client_socket_unittest.cc2
-rw-r--r--net/base/tcp_client_socket_unittest.cc2
-rw-r--r--net/base/telnet_server_unittest.cc2
-rw-r--r--net/base/test_completion_callback_unittest.cc2
8 files changed, 8 insertions, 8 deletions
diff --git a/net/base/bzip2_filter_unittest.cc b/net/base/bzip2_filter_unittest.cc
index 19b5883..e246726 100644
--- a/net/base/bzip2_filter_unittest.cc
+++ b/net/base/bzip2_filter_unittest.cc
@@ -7,10 +7,10 @@
#include "base/file_util.h"
#include "base/path_service.h"
-#include "base/platform_test.h"
#include "base/scoped_ptr.h"
#include "net/base/bzip2_filter.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
#include "third_party/bzip2/bzlib.h"
namespace {
diff --git a/net/base/file_stream_unittest.cc b/net/base/file_stream_unittest.cc
index f3f208b..d970175 100644
--- a/net/base/file_stream_unittest.cc
+++ b/net/base/file_stream_unittest.cc
@@ -4,11 +4,11 @@
#include "base/file_util.h"
#include "base/path_service.h"
-#include "base/platform_test.h"
#include "net/base/file_stream.h"
#include "net/base/net_errors.h"
#include "net/base/test_completion_callback.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
static const char kTestData[] = "0123456789";
static const int kTestDataSize = arraysize(kTestData) - 1;
diff --git a/net/base/gzip_filter_unittest.cc b/net/base/gzip_filter_unittest.cc
index b58758f..7b2f73d 100644
--- a/net/base/gzip_filter_unittest.cc
+++ b/net/base/gzip_filter_unittest.cc
@@ -7,10 +7,10 @@
#include "base/file_util.h"
#include "base/path_service.h"
-#include "base/platform_test.h"
#include "base/scoped_ptr.h"
#include "net/base/gzip_filter.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
#include "third_party/zlib/zlib.h"
namespace {
diff --git a/net/base/listen_socket_unittest.cc b/net/base/listen_socket_unittest.cc
index 4baeeae..99a82c5 100644
--- a/net/base/listen_socket_unittest.cc
+++ b/net/base/listen_socket_unittest.cc
@@ -4,8 +4,8 @@
#include "net/base/listen_socket_unittest.h"
-#include "base/platform_test.h"
#include "net/base/net_util.h"
+#include "testing/platform_test.h"
const int ListenSocketTester::kTestPort = 9999;
diff --git a/net/base/ssl_client_socket_unittest.cc b/net/base/ssl_client_socket_unittest.cc
index 8e60b42..cd7a1ed 100644
--- a/net/base/ssl_client_socket_unittest.cc
+++ b/net/base/ssl_client_socket_unittest.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/platform_test.h"
#include "net/base/address_list.h"
#include "net/base/client_socket_factory.h"
#include "net/base/host_resolver.h"
@@ -13,6 +12,7 @@
#include "net/base/tcp_client_socket.h"
#include "net/base/test_completion_callback.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
//-----------------------------------------------------------------------------
diff --git a/net/base/tcp_client_socket_unittest.cc b/net/base/tcp_client_socket_unittest.cc
index 7dbbe45..18e6c21 100644
--- a/net/base/tcp_client_socket_unittest.cc
+++ b/net/base/tcp_client_socket_unittest.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/platform_test.h"
#include "net/base/address_list.h"
#include "net/base/host_resolver.h"
#include "net/base/net_errors.h"
@@ -10,6 +9,7 @@
#include "net/base/tcp_client_socket.h"
#include "net/base/test_completion_callback.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
class TCPClientSocketTest : public PlatformTest {
public:
diff --git a/net/base/telnet_server_unittest.cc b/net/base/telnet_server_unittest.cc
index 08a1607..53f87e8 100644
--- a/net/base/telnet_server_unittest.cc
+++ b/net/base/telnet_server_unittest.cc
@@ -4,9 +4,9 @@
// Tests TelnetServer.
-#include "base/platform_test.h"
#include "net/base/listen_socket_unittest.h"
#include "net/base/telnet_server.h"
+#include "testing/platform_test.h"
static const char* kCRLF = "\r\n";
diff --git a/net/base/test_completion_callback_unittest.cc b/net/base/test_completion_callback_unittest.cc
index 9695e66..9967482 100644
--- a/net/base/test_completion_callback_unittest.cc
+++ b/net/base/test_completion_callback_unittest.cc
@@ -7,8 +7,8 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "net/base/completion_callback.h"
#include "net/base/test_completion_callback.h"
-#include "base/platform_test.h"
#include "base/worker_pool.h"
+#include "testing/platform_test.h"
typedef PlatformTest TestCompletionCallbackTest;