extensions/test/extensions_unittests_main.cc - Issue 1676913002: [mojo] Delete third_party/mojo

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/test/extensions_unittests_main.cc

Issue 1676913002: [mojo] Delete third_party/mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: let's try that again Created 4 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:

Index: extensions/test/extensions_unittests_main.cc

diff --git a/extensions/test/extensions_unittests_main.cc b/extensions/test/extensions_unittests_main.cc

index ac9e8ddf3efc944e0453c367f11fd87068123550..bb9cc00d30f04f2058db2ac4e169fc6bb042894b 100644

--- a/extensions/test/extensions_unittests_main.cc

+++ b/extensions/test/extensions_unittests_main.cc

@@ -13,7 +13,7 @@

#include "extensions/common/constants.h"

#include "extensions/common/extension_paths.h"

#include "extensions/test/test_extensions_client.h"

-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"

+#include "mojo/edk/embedder/embedder.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/gl/test/gl_surface_test_support.h"

#include "url/url_util.h"

@@ -110,7 +110,7 @@ void ExtensionsTestSuite::Shutdown() {

int main(int argc, char** argv) {

content::UnitTestTestSuite test_suite(new ExtensionsTestSuite(argc, argv));

- mojo::embedder::Init();

+ mojo::edk::Init();

return base::LaunchUnitTests(argc,

argv,

base::Bind(&content::UnitTestTestSuite::Run,

« no previous file with comments | « extensions/test/DEPS ('k') | ipc/mojo/BUILD.gn » ('j') | no next file with comments »