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

Side by Side Diff: extensions/test/extensions_unittests_main.cc

Issue 621153003: Move mojo edk into mojo/edk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix checkdeps Created 6 years, 2 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/mojo/BUILD.gn » ('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 "content/public/common/content_client.h" 10 #include "content/public/common/content_client.h"
11 #include "content/public/test/content_test_suite_base.h" 11 #include "content/public/test/content_test_suite_base.h"
12 #include "content/public/test/unittest_test_suite.h" 12 #include "content/public/test/unittest_test_suite.h"
13 #include "extensions/common/constants.h" 13 #include "extensions/common/constants.h"
14 #include "extensions/common/extension_paths.h" 14 #include "extensions/common/extension_paths.h"
15 #include "extensions/test/test_extensions_client.h" 15 #include "extensions/test/test_extensions_client.h"
16 #include "mojo/embedder/test_embedder.h" 16 #include "mojo/edk/embedder/test_embedder.h"
17 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
18 #include "ui/gl/gl_surface.h" 18 #include "ui/gl/gl_surface.h"
19 19
20 namespace { 20 namespace {
21 21
22 // Content client that exists only to register chrome-extension:// scheme with 22 // Content client that exists only to register chrome-extension:// scheme with
23 // the url module. 23 // the url module.
24 // TODO(jamescook): Should this be merged with ShellContentClient? Should this 24 // TODO(jamescook): Should this be merged with ShellContentClient? Should this
25 // be a persistent object available to tests? 25 // be a persistent object available to tests?
26 class ExtensionsContentClient : public content::ContentClient { 26 class ExtensionsContentClient : public content::ContentClient {
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 99
100 int main(int argc, char** argv) { 100 int main(int argc, char** argv) {
101 content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv)); 101 content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv));
102 102
103 mojo::embedder::test::InitWithSimplePlatformSupport(); 103 mojo::embedder::test::InitWithSimplePlatformSupport();
104 return base::LaunchUnitTests(argc, 104 return base::LaunchUnitTests(argc,
105 argv, 105 argv,
106 base::Bind(&content::UnitTestTestSuite::Run, 106 base::Bind(&content::UnitTestTestSuite::Run,
107 base::Unretained(&test_suite))); 107 base::Unretained(&test_suite)));
108 } 108 }
OLDNEW
« no previous file with comments | « extensions/test/DEPS ('k') | ipc/mojo/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698