summaryrefslogtreecommitdiffstats
path: root/chrome/test/unit
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-05 19:03:05 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-05 19:03:05 +0000
commitcbb9f50f408e81cc271df08fa969ef3f8d06bca1 (patch)
treec011aa7829510d1cfc39c8ad49ee66e412bfdfa7 /chrome/test/unit
parent6b1b77e9f51dcf24fff29720d6b4063983a2d5b8 (diff)
downloadchromium_src-cbb9f50f408e81cc271df08fa969ef3f8d06bca1.zip
chromium_src-cbb9f50f408e81cc271df08fa969ef3f8d06bca1.tar.gz
chromium_src-cbb9f50f408e81cc271df08fa969ef3f8d06bca1.tar.bz2
Move TestTimeouts from chrome/test to base/test.
BUG=None TEST=unittests Review URL: http://codereview.chromium.org/3544008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61540 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/unit')
-rw-r--r--chrome/test/unit/chrome_test_suite.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/test/unit/chrome_test_suite.cc b/chrome/test/unit/chrome_test_suite.cc
index 5f8d911..d9b9c65 100644
--- a/chrome/test/unit/chrome_test_suite.cc
+++ b/chrome/test/unit/chrome_test_suite.cc
@@ -16,7 +16,6 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
-#include "chrome/test/test_timeouts.h"
#include "chrome/test/testing_browser_process.h"
#include "net/base/net_errors.h"
@@ -98,8 +97,6 @@ void ChromeTestSuite::Initialize() {
app::RegisterPathProvider();
g_browser_process = new TestingBrowserProcess;
- TestTimeouts::Initialize();
-
if (!browser_dir_.empty()) {
PathService::Override(base::DIR_EXE, browser_dir_);
PathService::Override(base::DIR_MODULE, browser_dir_);