summaryrefslogtreecommitdiffstats
path: root/chrome/test/mini_installer_test
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/mini_installer_test
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/mini_installer_test')
-rw-r--r--chrome/test/mini_installer_test/mini_installer_test_util.cc2
-rw-r--r--chrome/test/mini_installer_test/run_all_unittests.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/mini_installer_test/mini_installer_test_util.cc b/chrome/test/mini_installer_test/mini_installer_test_util.cc
index e86b3e1..697f6d0 100644
--- a/chrome/test/mini_installer_test/mini_installer_test_util.cc
+++ b/chrome/test/mini_installer_test/mini_installer_test_util.cc
@@ -9,11 +9,11 @@
#include "base/platform_thread.h"
#include "base/process_util.h"
#include "base/string_util.h"
+#include "base/test/test_timeouts.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "chrome/installer/util/logging_installer.h"
#include "chrome/test/mini_installer_test/mini_installer_test_constants.h"
-#include "chrome/test/test_timeouts.h"
#include "testing/gtest/include/gtest/gtest.h"
// Change current directory so that chrome.dll from current folder
diff --git a/chrome/test/mini_installer_test/run_all_unittests.cc b/chrome/test/mini_installer_test/run_all_unittests.cc
index 13229d2..f8f1d42 100644
--- a/chrome/test/mini_installer_test/run_all_unittests.cc
+++ b/chrome/test/mini_installer_test/run_all_unittests.cc
@@ -6,10 +6,10 @@
#include "base/file_util.h"
#include "base/process_util.h"
#include "base/test/test_suite.h"
+#include "base/test/test_timeouts.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/installer/util/util_constants.h"
#include "chrome/test/mini_installer_test/mini_installer_test_constants.h"
-#include "chrome/test/test_timeouts.h"
#include "chrome_mini_installer.h"
void BackUpProfile(bool chrome_frame) {