summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-02 19:20:15 +0000
committerjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-02 19:20:15 +0000
commit23887f04fbf1ddadadea709206b265a3def2eb3a (patch)
treeb93cf25e8cc66180137fea6c5aad4148ec70fd58 /chrome
parent07c3f84910a6bc63a69d5f7fe0725090cf2af1ce (diff)
downloadchromium_src-23887f04fbf1ddadadea709206b265a3def2eb3a.zip
chromium_src-23887f04fbf1ddadadea709206b265a3def2eb3a.tar.gz
chromium_src-23887f04fbf1ddadadea709206b265a3def2eb3a.tar.bz2
* 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
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chrome_thread_unittest.cc2
-rw-r--r--chrome/browser/history/text_database_unittest.cc2
-rw-r--r--chrome/chrome.xcodeproj/project.pbxproj13
3 files changed, 2 insertions, 15 deletions
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 */,