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

Side by Side Diff: mojo/edk/test/run_all_unittests.cc

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 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
« no previous file with comments | « mojo/edk/test/run_all_perftests.cc ('k') | mojo/mojo.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <signal.h> 5 #include <signal.h>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/test/launcher/unit_test_launcher.h" 9 #include "base/test/launcher/unit_test_launcher.h"
10 #include "base/test/test_io_thread.h" 10 #include "base/test/test_io_thread.h"
(...skipping 22 matching lines...) Expand all
33 #endif 33 #endif
34 34
35 base::TestSuite test_suite(argc, argv); 35 base::TestSuite test_suite(argc, argv);
36 36
37 // Must be run before mojo::edk::Init. 37 // Must be run before mojo::edk::Init.
38 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 38 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
39 mojo::edk::test::kBrokerHandleSwitch)) { 39 mojo::edk::test::kBrokerHandleSwitch)) {
40 mojo::edk::PreInitializeChildProcess(); 40 mojo::edk::PreInitializeChildProcess();
41 } 41 }
42 42
43 // TODO(use_chrome_edk): temporary to force new EDK.
44 base::CommandLine::ForCurrentProcess()->AppendSwitch("--use-new-edk");
45
46 mojo::edk::Init(); 43 mojo::edk::Init();
47 44
48 mojo::test::TestSupport::Init(new mojo::edk::test::TestSupportImpl()); 45 mojo::test::TestSupport::Init(new mojo::edk::test::TestSupportImpl());
49 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); 46 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
50 // Leak this because its destructor calls mojo::edk::ShutdownIPCSupport which 47 // Leak this because its destructor calls mojo::edk::ShutdownIPCSupport which
51 // really does nothing in the new EDK but does depend on the current message 48 // really does nothing in the new EDK but does depend on the current message
52 // loop, which is destructed inside base::LaunchUnitTests. 49 // loop, which is destructed inside base::LaunchUnitTests.
53 new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner()); 50 new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner());
54 51
55 return base::LaunchUnitTests( 52 return base::LaunchUnitTests(
56 argc, argv, 53 argc, argv,
57 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); 54 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
58 } 55 }
OLDNEW
« no previous file with comments | « mojo/edk/test/run_all_perftests.cc ('k') | mojo/mojo.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698