| Index: components/nacl/loader/nonsfi/run_all_unittests.cc
|
| diff --git a/win8/metro_driver/run_all_unittests.cc b/components/nacl/loader/nonsfi/run_all_unittests.cc
|
| similarity index 51%
|
| copy from win8/metro_driver/run_all_unittests.cc
|
| copy to components/nacl/loader/nonsfi/run_all_unittests.cc
|
| index 4c6a548e2f40fc7e6c32a4d546d1a4fb13bb6015..7abc25735a48b2acd075c1618f51bfad8118f695 100644
|
| --- a/win8/metro_driver/run_all_unittests.cc
|
| +++ b/components/nacl/loader/nonsfi/run_all_unittests.cc
|
| @@ -1,19 +1,21 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright 2015 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
| -#include "stdafx.h"
|
|
|
| #include "base/at_exit.h"
|
| +#include "base/test/launcher/unit_test_launcher.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -#pragma comment(lib, "runtimeobject.lib")
|
| +namespace {
|
|
|
| -base::AtExitManager at_exit;
|
| +int RunAllTestsImpl() {
|
| + return RUN_ALL_TESTS();
|
| +}
|
|
|
| -int main(int argc, char** argv) {
|
| - mswrw::RoInitializeWrapper ro_init(RO_INIT_SINGLETHREADED);
|
| +} // namespace
|
|
|
| +int main(int argc, char** argv) {
|
| + base::AtExitManager at_exit;
|
| testing::InitGoogleTest(&argc, argv);
|
| -
|
| - return RUN_ALL_TESTS();
|
| + return base::LaunchUnitTests(argc, argv, base::Bind(&RunAllTestsImpl));
|
| }
|
|
|