| Index: chrome_elf/blacklist/test/blacklist_test_main.cc
|
| diff --git a/win8/metro_driver/run_all_unittests.cc b/chrome_elf/blacklist/test/blacklist_test_main.cc
|
| similarity index 51%
|
| copy from win8/metro_driver/run_all_unittests.cc
|
| copy to chrome_elf/blacklist/test/blacklist_test_main.cc
|
| index 4c6a548e2f40fc7e6c32a4d546d1a4fb13bb6015..c84b5ade684f539e3f09194b6305fd1716b50e6d 100644
|
| --- a/win8/metro_driver/run_all_unittests.cc
|
| +++ b/chrome_elf/blacklist/test/blacklist_test_main.cc
|
| @@ -1,19 +1,17 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright 2013 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 "chrome_elf/blacklist/test/blacklist_test_main_dll.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -#pragma comment(lib, "runtimeobject.lib")
|
| -
|
| -base::AtExitManager at_exit;
|
| -
|
| int main(int argc, char** argv) {
|
| - mswrw::RoInitializeWrapper ro_init(RO_INIT_SINGLETHREADED);
|
| -
|
| testing::InitGoogleTest(&argc, argv);
|
|
|
| - return RUN_ALL_TESTS();
|
| + base::AtExitManager at_exit_manager;
|
| +
|
| + InitBlacklistTestDll();
|
| +
|
| + RUN_ALL_TESTS();
|
| }
|
|
|