summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/base.xcodeproj/project.pbxproj6
-rw-r--r--base/clipboard_unittest.cc2
-rw-r--r--base/condition_variable_unittest.cc2
-rw-r--r--base/file_util_unittest.cc2
-rw-r--r--base/multiprocess_test.h2
-rw-r--r--base/path_service_unittest.cc2
-rw-r--r--base/platform_test.h37
-rw-r--r--base/platform_test_mac.mm15
-rw-r--r--base/sys_info_unittest.cc2
-rw-r--r--base/thread_unittest.cc2
-rw-r--r--base/worker_pool_unittest.cc2
11 files changed, 8 insertions, 66 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/platform_test.h b/base/platform_test.h
deleted file mode 100644
index c0b2257..0000000
--- a/base/platform_test.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-#ifndef BASE_PLATFORM_TEST_H_
-#define BASE_PLATFORM_TEST_H_
-
-#include "build/build_config.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-#if defined(OS_MACOSX)
-#ifdef __OBJC__
-@class NSAutoreleasePool;
-#else
-class NSAutoreleasePool;
-#endif
-
-// The purpose of this class us to provide a hook for platform-specific
-// SetUp and TearDown across unit tests. For example, on the Mac, it
-// creates and releases an outer AutoreleasePool for each test. For now, it's
-// only implemented on the Mac. To enable this for another platform, just
-// adjust the #ifdefs and add a platform_test_<platform>.cc implementation file.
-class PlatformTest : public testing::Test {
- protected:
- virtual void SetUp();
- virtual void TearDown();
-
- private:
- NSAutoreleasePool* pool_;
-};
-#else
-typedef testing::Test PlatformTest;
-#endif // OS_MACOSX
-
-#endif // BASE_PLATFORM_TEST_H_
-
-
diff --git a/base/platform_test_mac.mm b/base/platform_test_mac.mm
deleted file mode 100644
index f3802c1..0000000
--- a/base/platform_test_mac.mm
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2006-2008 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.
-
-#include "base/platform_test.h"
-
-#import <Foundation/Foundation.h>
-
-void PlatformTest::SetUp() {
- pool_ = [[NSAutoreleasePool alloc] init];
-}
-
-void PlatformTest::TearDown() {
- [pool_ drain];
-}
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;
generated by cgit v1.1 at 2025-02-02 09:02:51 +0000