* Cleanup: move base/platform_test.h -> testing/

* Add support for "Debug On Start" switch to MultiprocessTest::SpawnChild

Review URL: http://codereview.chromium.org/13052

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6227 0039d316-1c4b-4281-b951-d872f2087c98

29 files changed, 36 insertions, 63 deletions

diff --git a/base/base.xcodeproj/project.pbxproj b/base/base.xcodeproj/project.pbxproj
index 7769b15..1663719 100644
--- a/base/base.xcodeproj/project.pbxproj
+++ b/base/base.xcodeproj/project.pbxproj
@@ -148,7 +148,6 @@
 		A5A026550E4A214600498DA9 /* file_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = A5A026540E4A214600498DA9 /* file_util.cc */; };
 		A5A0268E0E4A2BDC00498DA9 /* file_util_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = A5A0268D0E4A2BDC00498DA9 /* file_util_posix.cc */; };
 		A5A0270B0E4A630D00498DA9 /* file_util_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5A0270A0E4A630D00498DA9 /* file_util_mac.mm */; };
-		A5CB82980E5C74E300FD6825 /* platform_test_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5CB82970E5C74E300FD6825 /* platform_test_mac.mm */; };
 		A5CE1D2B0E55F4D800AD0606 /* file_util_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = A5A0282D0E4CFA8500498DA9 /* file_util_unittest.cc */; };
 		AB4C147D0EC0E3F600655FED /* time_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BEB81490D9B0F33009BA8DD /* time_mac.cc */; };
 		AB956E030E5DDB7A00BBE9D8 /* image_operations.cc in Sources */ = {isa = PBXBuildFile; fileRef = E48A06370E3F6C1F00172919 /* image_operations.cc */; };
@@ -605,8 +604,6 @@
 		A5A0270A0E4A630D00498DA9 /* file_util_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = file_util_mac.mm; sourceTree = "<group>"; };
 		A5A0276B0E4BA33700498DA9 /* build_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = build_config.h; path = ../build/build_config.h; sourceTree = SOURCE_ROOT; };
 		A5A0282D0E4CFA8500498DA9 /* file_util_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_util_unittest.cc; sourceTree = "<group>"; };
-		A5CB82960E5C74E300FD6825 /* platform_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform_test.h; sourceTree = "<group>"; };
-		A5CB82970E5C74E300FD6825 /* platform_test_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platform_test_mac.mm; sourceTree = "<group>"; };
 		AB14B6060EBFA74C00FB3807 /* time_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = time_posix.cc; sourceTree = "<group>"; };
 		ABE1BA290E7574D1009041DA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<group>"; };
 		ABE1BA600E75757C009041DA /* skia_utils_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skia_utils_mac.cc; sourceTree = "<group>"; };
@@ -931,8 +928,6 @@
 				E4562C680E2803C3005E4685 /* pickle_unittest.cc */,
 				A573F5D70EBB78260055A84A /* platform_file.h */,
 				A573F5D80EBB78260055A84A /* platform_file_posix.cc */,
-				A5CB82960E5C74E300FD6825 /* platform_test.h */,
-				A5CB82970E5C74E300FD6825 /* platform_test_mac.mm */,
 				82E23FCB0D9C219600F8B40A /* platform_thread.h */,
 				7BF164F20E660CA500AA999E /* platform_thread_mac.mm */,
 				93E703160E5D63E00046259B /* platform_thread_posix.cc */,
@@ -1475,7 +1470,6 @@
 				7B78D3950E54FE0100609465 /* observer_list_unittest.cc in Sources */,
 				7B78D3960E54FE0100609465 /* path_service_unittest.cc in Sources */,
 				7B78D3970E54FE0100609465 /* pickle_unittest.cc in Sources */,
-				A5CB82980E5C74E300FD6825 /* platform_test_mac.mm in Sources */,
 				7B8505D50E5B441000730B43 /* png_codec_unittest.cc in Sources */,
 				7B78D3980E54FE0100609465 /* pr_time_unittest.cc in Sources */,
 				4D11B59C0E91730500EF7617 /* rand_util_unittest.cc in Sources */,
diff --git a/base/clipboard_unittest.cc b/base/clipboard_unittest.cc
index fb48b49..5432a58 100644
--- a/base/clipboard_unittest.cc
+++ b/base/clipboard_unittest.cc
@@ -6,10 +6,10 @@
 
 #include "base/basictypes.h"
 #include "base/clipboard.h"
-#include "base/platform_test.h"
 #include "base/scoped_clipboard_writer.h"
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 typedef PlatformTest ClipboardTest;
 
diff --git a/base/condition_variable_unittest.cc b/base/condition_variable_unittest.cc
index ee5d1c5..c996f2c 100644
--- a/base/condition_variable_unittest.cc
+++ b/base/condition_variable_unittest.cc
@@ -10,11 +10,11 @@
 
 #include "base/condition_variable.h"
 #include "base/logging.h"
-#include "base/platform_test.h"
 #include "base/platform_thread.h"
 #include "base/scoped_ptr.h"
 #include "base/spin_wait.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index 90066ff..3a4962d 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -19,9 +19,9 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/platform_test.h"
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
diff --git a/base/multiprocess_test.h b/base/multiprocess_test.h
index a85334e..6f2dd40 100644
--- a/base/multiprocess_test.h
+++ b/base/multiprocess_test.h
@@ -6,11 +6,11 @@
 #define BASE_MULTIPROCESS_TEST_H__
 
 #include "base/command_line.h"
-#include "base/platform_test.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
+#include "testing/platform_test.h"
 
 #if defined(OS_POSIX)
 #include <sys/types.h>
diff --git a/base/path_service_unittest.cc b/base/path_service_unittest.cc
index 92dde5a..6376efb 100644
--- a/base/path_service_unittest.cc
+++ b/base/path_service_unittest.cc
@@ -8,12 +8,12 @@
 #include "base/file_util.h"
 #include "base/file_path.h"
 #include "base/logging.h"
-#include "base/platform_test.h"
 #if defined(OS_WIN)
 #include "base/win_util.h"
 #endif
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest/include/gtest/gtest-spi.h"
+#include "testing/platform_test.h"
 
 namespace {
 
diff --git a/base/sys_info_unittest.cc b/base/sys_info_unittest.cc
index ea67aa4..ec43c05 100644
--- a/base/sys_info_unittest.cc
+++ b/base/sys_info_unittest.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/file_util.h"
-#include "base/platform_test.h"
 #include "base/sys_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 typedef PlatformTest SysInfoTest;
 
diff --git a/base/thread_unittest.cc b/base/thread_unittest.cc
index f11cb8d..085df71 100644
--- a/base/thread_unittest.cc
+++ b/base/thread_unittest.cc
@@ -4,10 +4,10 @@
 
 #include "base/lock.h"
 #include "base/message_loop.h"
-#include "base/platform_test.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 using base::Thread;
 
diff --git a/base/worker_pool_unittest.cc b/base/worker_pool_unittest.cc
index e3b5c16..e07e8ab 100644
--- a/base/worker_pool_unittest.cc
+++ b/base/worker_pool_unittest.cc
@@ -2,11 +2,11 @@
 // 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 "base/task.h"
 #include "base/waitable_event.h"
 #include "base/worker_pool.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 using base::WaitableEvent;
 
diff --git a/chrome/browser/chrome_thread_unittest.cc b/chrome/browser/chrome_thread_unittest.cc
index 9cec624..c68cbf0 100644
--- a/chrome/browser/chrome_thread_unittest.cc
+++ b/chrome/browser/chrome_thread_unittest.cc
@@ -4,9 +4,9 @@
 
 #include <vector>
 
-#include "base/platform_test.h"
 #include "chrome/browser/chrome_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 typedef PlatformTest ChromeThreadTest;
 
diff --git a/chrome/browser/history/text_database_unittest.cc b/chrome/browser/history/text_database_unittest.cc
index 550a347..4967f2f6 100644
--- a/chrome/browser/history/text_database_unittest.cc
+++ b/chrome/browser/history/text_database_unittest.cc
@@ -4,11 +4,11 @@
 
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "base/platform_test.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/history/text_database.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 using base::Time;
 
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index 5b08bf2..59b5676 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -134,7 +134,6 @@
 		4D7BFF5E0E9D53FD009A6919 /* libbase_gfx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D7BFDC90E9D525B009A6919 /* libbase_gfx.a */; };
 		4D7BFF730E9D5425009A6919 /* libgoogleurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D7BFF6E0E9D540F009A6919 /* libgoogleurl.a */; };
 		4D7BFF7B0E9D5449009A6919 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D7BFF7A0E9D5449009A6919 /* AppKit.framework */; };
-		4DC6498F0EA92BF90017C876 /* platform_test_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4DC6498E0EA92BF90017C876 /* platform_test_mac.mm */; };
 		4DDC63E70EAE344300FB5EBE /* metrics_response_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8B60E9D4839009A6919 /* metrics_response_unittest.cc */; };
 		4DDC644B0EAE390800FB5EBE /* libxml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D7BFB230E9D4BBF009A6919 /* libxml.a */; };
 		4DDC64580EAE394200FB5EBE /* libzlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DDC64550EAE392400FB5EBE /* libzlib.a */; };
@@ -1292,7 +1291,6 @@
 		4D7BFF4C0E9D53C1009A6919 /* bzip2.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = bzip2.xcodeproj; path = third_party/bzip2/bzip2.xcodeproj; sourceTree = "<group>"; };
 		4D7BFF5F0E9D540F009A6919 /* googleurl.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = googleurl.xcodeproj; path = build/googleurl.xcodeproj; sourceTree = "<group>"; };
 		4D7BFF7A0E9D5449009A6919 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = "<group>"; };
-		4DC6498E0EA92BF90017C876 /* platform_test_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platform_test_mac.mm; sourceTree = "<group>"; };
 		4DDC64500EAE392400FB5EBE /* zlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = zlib.xcodeproj; path = third_party/zlib/zlib.xcodeproj; sourceTree = "<group>"; };
 		B54BD8FA0ED622C00093FD54 /* mach_message_source_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mach_message_source_mac.cc; sourceTree = "<group>"; };
 		B54BD8FB0ED622C00093FD54 /* mach_message_source_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mach_message_source_mac.h; sourceTree = "<group>"; };
@@ -1486,7 +1484,6 @@
 			isa = PBXGroup;
 			children = (
 				4D7BF2FA0E9D46CD009A6919 /* Configuration */,
-				4DC6498D0EA92BE10017C876 /* base */,
 				4D7BF3380E9D479D009A6919 /* chrome */,
 				4D7BFDD00E9D527E009A6919 /* Frameworks */,
 				4D7BFB090E9D4BA1009A6919 /* Projects */,
@@ -2389,15 +2386,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		4DC6498D0EA92BE10017C876 /* base */ = {
-			isa = PBXGroup;
-			children = (
-				4DC6498E0EA92BF90017C876 /* platform_test_mac.mm */,
-			);
-			name = base;
-			path = ../base;
-			sourceTree = "<group>";
-		};
 		4DDC64510EAE392400FB5EBE /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -2921,7 +2909,6 @@
 				4DDC63E70EAE344300FB5EBE /* metrics_response_unittest.cc in Sources */,
 				4D7BFB580E9D4C43009A6919 /* page_range_unittest.cc in Sources */,
 				4D7BFB5F0E9D4C46009A6919 /* page_setup_unittest.cc in Sources */,
-				4DC6498F0EA92BF90017C876 /* platform_test_mac.mm in Sources */,
 				4D7BFB780E9D4C5A009A6919 /* protocol_parser_unittest.cc in Sources */,
 				4D7BFCF30E9D4E07009A6919 /* run_all_unittests.cc in Sources */,
 				E48FB9870EC4EBA10052B72B /* safe_browsing_database_unittest.cc in Sources */,
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;
 
diff --git a/net/disk_cache/disk_cache_perftest.cc b/net/disk_cache/disk_cache_perftest.cc
index 33cad54..ecae2c3 100644
--- a/net/disk_cache/disk_cache_perftest.cc
+++ b/net/disk_cache/disk_cache_perftest.cc
@@ -9,7 +9,6 @@
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/perftimer.h"
-#include "base/platform_test.h"
 #if defined(OS_WIN)
 #include "base/scoped_handle.h"
 #endif
@@ -21,6 +20,7 @@
 #include "net/disk_cache/disk_cache_test_util.h"
 #include "net/disk_cache/hash.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 using base::Time;
 
diff --git a/net/disk_cache/disk_cache_test_base.h b/net/disk_cache/disk_cache_test_base.h
index 6b75361..3c38921 100644
--- a/net/disk_cache/disk_cache_test_base.h
+++ b/net/disk_cache/disk_cache_test_base.h
@@ -6,8 +6,8 @@
 #define NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_
 
 #include "base/basictypes.h"
-#include "base/platform_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace disk_cache {
 
diff --git a/net/http/http_network_layer_unittest.cc b/net/http/http_network_layer_unittest.cc
index 33c93e2..2bccd8a 100644
--- a/net/http/http_network_layer_unittest.cc
+++ b/net/http/http_network_layer_unittest.cc
@@ -2,12 +2,12 @@
 // 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/scoped_host_mapper.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_transaction_unittest.h"
 #include "net/proxy/proxy_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 class HttpNetworkLayerTest : public PlatformTest {
  public:
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index fde12f4..68a643e 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -5,7 +5,6 @@
 #include <math.h>  // ceil
 
 #include "base/compiler_specific.h"
-#include "base/platform_test.h"
 #include "net/base/client_socket_factory.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/upload_data.h"
@@ -15,6 +14,7 @@
 #include "net/proxy/proxy_resolver_fixed.h"
 #include "net/proxy/proxy_resolver_null.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 //-----------------------------------------------------------------------------
 
diff --git a/net/net.xcodeproj/project.pbxproj b/net/net.xcodeproj/project.pbxproj
index 55b413a..11a8199 100644
--- a/net/net.xcodeproj/project.pbxproj
+++ b/net/net.xcodeproj/project.pbxproj
@@ -53,7 +53,6 @@
 		4DB04D3F0EB24EDF00A5633C /* dns_resolution_observer.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32590E5A181C00A747DB /* dns_resolution_observer.cc */; };
 		533102E70E5E3EBF00FF8E32 /* net_util_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = 533102E60E5E3EBF00FF8E32 /* net_util_posix.cc */; };
 		7B2630680E82F2A1001CE27F /* libevent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B2630650E82F282001CE27F /* libevent.a */; };
-		7B466C470E5E732900C91F63 /* platform_test_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7B466C460E5E732900C91F63 /* platform_test_mac.mm */; };
 		7B4DF64A0E5B98DF004D7619 /* client_socket_pool_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED326A0E5A181C00A747DB /* client_socket_pool_unittest.cc */; };
 		7B4DF6A90E5B98E7004D7619 /* data_url_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED325F0E5A181C00A747DB /* data_url_unittest.cc */; };
 		7B4DF6B10E5B98ED004D7619 /* escape_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32BF0E5A181C00A747DB /* escape_unittest.cc */; };
@@ -432,7 +431,6 @@
 		04E7BD560EC4ED020078FE58 /* http_auth_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = http_auth_cache.h; sourceTree = "<group>"; };
 		533102E60E5E3EBF00FF8E32 /* net_util_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = net_util_posix.cc; sourceTree = "<group>"; };
 		7B2630600E82F282001CE27F /* libevent.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libevent.xcodeproj; path = third_party/libevent/libevent.xcodeproj; sourceTree = "<group>"; };
-		7B466C460E5E732900C91F63 /* platform_test_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platform_test_mac.mm; sourceTree = "<group>"; };
 		7B82FF450E763620008F45CF /* host_resolver_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = host_resolver_unittest.cc; sourceTree = "<group>"; };
 		7B8501F10E5A372500730B43 /* googleurl.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = googleurl.xcodeproj; path = build/googleurl.xcodeproj; sourceTree = "<group>"; };
 		7B8502620E5A38BB00730B43 /* modp_b64.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = modp_b64.xcodeproj; path = third_party/modp_b64/modp_b64.xcodeproj; sourceTree = "<group>"; };
@@ -733,7 +731,6 @@
 			isa = PBXGroup;
 			children = (
 				7BED316D0E5A142300A747DB /* Configuration */,
-				7BED32150E5A172D00A747DB /* base */,
 				7BED32140E5A172300A747DB /* net */,
 				7BED31A20E5A15DD00A747DB /* Frameworks */,
 				E4AFA62D0E52409300201347 /* Projects */,
@@ -851,15 +848,6 @@
 			name = net;
 			sourceTree = "<group>";
 		};
-		7BED32150E5A172D00A747DB /* base */ = {
-			isa = PBXGroup;
-			children = (
-				7B466C460E5E732900C91F63 /* platform_test_mac.mm */,
-			);
-			name = base;
-			path = ../base;
-			sourceTree = "<group>";
-		};
 		7BED32420E5A17C000A747DB /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -1575,7 +1563,6 @@
 				7B4DF9AC0E5C906A004D7619 /* mime_sniffer_unittest.cc in Sources */,
 				048268090E5B3B4800A30786 /* mime_util_unittest.cc in Sources */,
 				BAA46E3B0E5CE99A00E77460 /* net_util_unittest.cc in Sources */,
-				7B466C470E5E732900C91F63 /* platform_test_mac.mm in Sources */,
 				7BA361ED0E8C38D30023C8B9 /* proxy_service_unittest.cc in Sources */,
 				7B8B5B9E0E5D188E002F9A97 /* registry_controlled_domain_unittest.cc in Sources */,
 				E4AFA6430E5241B400201347 /* run_all_unittests.cc in Sources */,
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 8de9dce..e2197f8 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -14,7 +14,6 @@
 
 #include "base/message_loop.h"
 #include "base/path_service.h"
-#include "base/platform_test.h"
 #include "base/process_util.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
@@ -27,6 +26,7 @@
 #include "net/http/http_network_layer.h"
 #include "net/url_request/url_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 using base::Time;
 
diff --git a/testing/gtest.xcodeproj/project.pbxproj b/testing/gtest.xcodeproj/project.pbxproj
index 9498879..809d6c7 100644
--- a/testing/gtest.xcodeproj/project.pbxproj
+++ b/testing/gtest.xcodeproj/project.pbxproj
@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		B593AFF90EB7D41B00B72887 /* multiprocess_func_list.cc in Sources */ = {isa = PBXBuildFile; fileRef = B593AFF70EB7D41B00B72887 /* multiprocess_func_list.cc */; };
+		B5E5A6A00EE4BCCA007808DF /* platform_test_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = B5E5A69F0EE4BCCA007808DF /* platform_test_mac.mm */; };
 		E45A2BBC0E47A20200DB1196 /* gtest_main.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45A2BB60E47A20200DB1196 /* gtest_main.cc */; };
 		E45A2BBD0E47A20200DB1196 /* gtest-death-test.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45A2BB70E47A20200DB1196 /* gtest-death-test.cc */; };
 		E45A2BBE0E47A20200DB1196 /* gtest-filepath.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45A2BB80E47A20200DB1196 /* gtest-filepath.cc */; };
@@ -23,6 +24,8 @@
 		7BED30E00E59F69A00A747DB /* staticlib.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = staticlib.xcconfig; sourceTree = "<group>"; };
 		B593AFF70EB7D41B00B72887 /* multiprocess_func_list.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = multiprocess_func_list.cc; sourceTree = SOURCE_ROOT; };
 		B593AFF80EB7D41B00B72887 /* multiprocess_func_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = multiprocess_func_list.h; sourceTree = SOURCE_ROOT; };
+		B5E5A69E0EE4BCCA007808DF /* platform_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform_test.h; sourceTree = SOURCE_ROOT; };
+		B5E5A69F0EE4BCCA007808DF /* platform_test_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platform_test_mac.mm; sourceTree = SOURCE_ROOT; };
 		D2AAC046055464E500DB518D /* libgtest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgtest.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		E45A2BB60E47A20200DB1196 /* gtest_main.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gtest_main.cc; sourceTree = "<group>"; };
 		E45A2BB70E47A20200DB1196 /* gtest-death-test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "gtest-death-test.cc"; sourceTree = "<group>"; };
@@ -64,6 +67,8 @@
 				E45A2BB60E47A20200DB1196 /* gtest_main.cc */,
 				B593AFF70EB7D41B00B72887 /* multiprocess_func_list.cc */,
 				B593AFF80EB7D41B00B72887 /* multiprocess_func_list.h */,
+				B5E5A69E0EE4BCCA007808DF /* platform_test.h */,
+				B5E5A69F0EE4BCCA007808DF /* platform_test_mac.mm */,
 			);
 			name = Source;
 			path = gtest/src;
@@ -137,6 +142,7 @@
 				E45A2BC10E47A20200DB1196 /* gtest.cc in Sources */,
 				E45A2BBC0E47A20200DB1196 /* gtest_main.cc in Sources */,
 				B593AFF90EB7D41B00B72887 /* multiprocess_func_list.cc in Sources */,
+				B5E5A6A00EE4BCCA007808DF /* platform_test_mac.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/base/platform_test.h b/testing/platform_test.h
index c0b2257..6e5e039 100644
--- a/base/platform_test.h
+++ b/testing/platform_test.h
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_PLATFORM_TEST_H_
-#define BASE_PLATFORM_TEST_H_
+#ifndef TESTING_PLATFORM_TEST_H_
+#define TESTING_PLATFORM_TEST_H_
 
-#include "build/build_config.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include <gtest/gtest.h>
 
-#if defined(OS_MACOSX)
+#if defined(GTEST_OS_MAC)
 #ifdef __OBJC__
 @class NSAutoreleasePool;
 #else
@@ -30,8 +29,8 @@ class PlatformTest : public testing::Test {
 };
 #else
 typedef testing::Test PlatformTest;
-#endif // OS_MACOSX
+#endif // GTEST_OS_MAC
 
-#endif // BASE_PLATFORM_TEST_H_
+#endif // TESTING_PLATFORM_TEST_H_
 
 
diff --git a/base/platform_test_mac.mm b/testing/platform_test_mac.mm
index f3802c1..e4aaeab 100644
--- a/base/platform_test_mac.mm
+++ b/testing/platform_test_mac.mm
@@ -2,7 +2,7 @@
 // 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 "platform_test.h"
 
 #import <Foundation/Foundation.h>