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

Side by Side Diff: extensions/test/extensions_unittests_main.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 | « extensions/test/DEPS ('k') | ipc/attachment_broker.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/base_paths.h" 5 #include "base/base_paths.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/path_service.h" 8 #include "base/path_service.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 "content/public/common/content_client.h" 11 #include "content/public/common/content_client.h"
11 #include "content/public/test/content_test_suite_base.h" 12 #include "content/public/test/content_test_suite_base.h"
12 #include "content/public/test/unittest_test_suite.h" 13 #include "content/public/test/unittest_test_suite.h"
13 #include "extensions/common/constants.h" 14 #include "extensions/common/constants.h"
14 #include "extensions/common/extension_paths.h" 15 #include "extensions/common/extension_paths.h"
15 #include "extensions/test/test_extensions_client.h" 16 #include "extensions/test/test_extensions_client.h"
16 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" 17 #include "mojo/edk/embedder/embedder.h"
17 #include "ui/base/resource/resource_bundle.h" 18 #include "ui/base/resource/resource_bundle.h"
18 #include "ui/gl/test/gl_surface_test_support.h" 19 #include "ui/gl/test/gl_surface_test_support.h"
19 #include "url/url_util.h" 20 #include "url/url_util.h"
20 21
21 namespace { 22 namespace {
22 23
23 const int kNumExtensionStandardURLSchemes = 2; 24 const int kNumExtensionStandardURLSchemes = 2;
24 const url::SchemeWithType kExtensionStandardURLSchemes[ 25 const url::SchemeWithType kExtensionStandardURLSchemes[
25 kNumExtensionStandardURLSchemes] = { 26 kNumExtensionStandardURLSchemes] = {
26 {extensions::kExtensionScheme, url::SCHEME_WITHOUT_PORT}, 27 {extensions::kExtensionScheme, url::SCHEME_WITHOUT_PORT},
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 104
104 ui::ResourceBundle::CleanupSharedInstance(); 105 ui::ResourceBundle::CleanupSharedInstance();
105 content::ContentTestSuiteBase::Shutdown(); 106 content::ContentTestSuiteBase::Shutdown();
106 } 107 }
107 108
108 } // namespace 109 } // namespace
109 110
110 int main(int argc, char** argv) { 111 int main(int argc, char** argv) {
111 content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv)); 112 content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv));
112 113
113 mojo::embedder::Init(); 114 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
115 mojo::edk::Init(test_io_thread.task_runner());
114 return base::LaunchUnitTests(argc, 116 return base::LaunchUnitTests(argc,
115 argv, 117 argv,
116 base::Bind(&content::UnitTestTestSuite::Run, 118 base::Bind(&content::UnitTestTestSuite::Run,
117 base::Unretained(&test_suite))); 119 base::Unretained(&test_suite)));
118 } 120 }
OLDNEW
« no previous file with comments | « extensions/test/DEPS ('k') | ipc/attachment_broker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698