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

Unified Diff: sandbox/win/tests/integration_tests/integration_tests.cc

Issue 314173005: Revert of Convert installer_util_unittests, sbox_integration_tests, sbox_validation_tests, sbox_unittests to … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
« no previous file with comments | « sandbox/win/sandbox_win.gypi ('k') | sandbox/win/tests/unit_tests/unit_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/win/tests/integration_tests/integration_tests.cc
diff --git a/sandbox/win/tests/integration_tests/integration_tests.cc b/sandbox/win/tests/integration_tests/integration_tests.cc
index bb809316000608017d4bfedf2218d8a0a5ef138f..1996430bb9ea0ae007ee8f579121a9b45727dfb6 100644
--- a/sandbox/win/tests/integration_tests/integration_tests.cc
+++ b/sandbox/win/tests/integration_tests/integration_tests.cc
@@ -2,9 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/bind.h"
-#include "base/test/launcher/unit_test_launcher.h"
-#include "base/test/test_suite.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "sandbox/win/tests/common/controller.h"
@@ -16,10 +13,6 @@
return sandbox::DispatchCall(argc, argv);
}
- TestSuite test_suite(argc, argv);
- return base::LaunchUnitTests(
- argc,
- argv,
- false,
- base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
+ testing::InitGoogleTest(&argc, argv);
+ return RUN_ALL_TESTS();
}
« no previous file with comments | « sandbox/win/sandbox_win.gypi ('k') | sandbox/win/tests/unit_tests/unit_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698