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

Side by Side Diff: chrome/test/base/run_all_unittests.cc

Issue 2476573004: Use InstallDetails in installer_util. (Closed)
Patch Set: sync to position 450321 Created 3 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 unified diff | Download patch
« chrome/installer/util/install_util.cc ('K') | « chrome/test/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/test/launcher/unit_test_launcher.h" 7 #include "base/test/launcher/unit_test_launcher.h"
8 #include "base/test/test_io_thread.h" 8 #include "base/test/test_io_thread.h"
9 #include "build/build_config.h"
9 #include "chrome/test/base/chrome_unit_test_suite.h" 10 #include "chrome/test/base/chrome_unit_test_suite.h"
10 #include "content/public/test/unittest_test_suite.h" 11 #include "content/public/test/unittest_test_suite.h"
11 #include "mojo/edk/embedder/scoped_ipc_support.h" 12 #include "mojo/edk/embedder/scoped_ipc_support.h"
12 13
14 #if defined(OS_WIN)
15 #include "chrome/install_static/test/scoped_install_details.h"
16 #endif
17
13 int main(int argc, char **argv) { 18 int main(int argc, char **argv) {
14 content::UnitTestTestSuite test_suite(new ChromeUnitTestSuite(argc, argv)); 19 content::UnitTestTestSuite test_suite(new ChromeUnitTestSuite(argc, argv));
15 20
16 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); 21 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
17 mojo::edk::ScopedIPCSupport ipc_support( 22 mojo::edk::ScopedIPCSupport ipc_support(
18 test_io_thread.task_runner(), 23 test_io_thread.task_runner(),
19 mojo::edk::ScopedIPCSupport::ShutdownPolicy::FAST); 24 mojo::edk::ScopedIPCSupport::ShutdownPolicy::FAST);
20 25
26 #if defined(OS_WIN)
27 install_static::ScopedInstallDetails scoped_install_details;
28 #endif
29
21 return base::LaunchUnitTests( 30 return base::LaunchUnitTests(
22 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, 31 argc, argv, base::Bind(&content::UnitTestTestSuite::Run,
23 base::Unretained(&test_suite))); 32 base::Unretained(&test_suite)));
24 } 33 }
OLDNEW
« chrome/installer/util/install_util.cc ('K') | « chrome/test/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698