Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2858)

Unified Diff: base/test/test_suite.cc

Issue 12321117: Refactor MainHook into TestSuite. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "moved hook from new file into existing test_support_ios." Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/test/test_suite.cc
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
index a55b8e08e2811517708f8cf263bb3d9b02c35701..07b9964578a4a860712524443bf977505ef7119c 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -116,6 +116,10 @@ void TestSuite::PreInitialize(int argc, char** argv,
at_exit_manager_.reset(new base::AtExitManager);
#endif
+#if defined(OS_IOS)
+ InitIOSRunHook(this, argc, argv);
+#endif
+
// Don't add additional code to this function. Instead add it to
// Initialize(). See bug 6436.
}
@@ -141,6 +145,10 @@ void TestSuite::ResetCommandLine() {
// Don't add additional code to this method. Instead add it to
// Initialize(). See bug 6436.
int TestSuite::Run() {
+#if defined(OS_IOS)
+ RunTestsFromIOSApp();
+#endif
+
#if defined(OS_MACOSX)
base::mac::ScopedNSAutoreleasePool scoped_pool;
#endif

Powered by Google App Engine
This is Rietveld 408576698