content/shell/browser/shell.cc - Issue 1470823002: Enable builtin Mojo JS modules in layout tests

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: content/shell/browser/shell.cc

Issue 1470823002: Enable builtin Mojo JS modules in layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@usb-testing

Patch Set: add 'define' to global interface expectations for AMD in layout tests 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 side-by-side diff with in-line comments

Download patch

« content/renderer/render_view_impl.cc ('K') | « content/renderer/render_view_impl.cc ('k') | third_party/WebKit/LayoutTests/mojo/mojo-api.html » ('j') | third_party/WebKit/LayoutTests/virtual/stable/webexposed/global-interface-listing-expected.txt » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/browser/shell.cc

diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc

index 6e8d8fc8b0854c0560fed91f8255e073a8b394f1..f26eed92900738e841cc53d2a9331c2d48404d79 100644

--- a/content/shell/browser/shell.cc

+++ b/content/shell/browser/shell.cc

@@ -24,6 +24,7 @@

#include "content/public/browser/render_widget_host.h"

#include "content/public/browser/web_contents.h"

#include "content/public/browser/web_contents_observer.h"

+#include "content/public/common/bindings_policy.h"

#include "content/public/common/content_switches.h"

#include "content/public/common/renderer_preferences.h"

#include "content/public/common/webrtc_ip_handling_policy.h"

@@ -122,6 +123,7 @@ Shell* Shell::CreateShell(WebContents* web_contents,

if (command_line->HasSwitch(switches::kRunLayoutTest)) {

web_contents->GetMutableRendererPrefs()->use_custom_colors = false;

web_contents->GetRenderViewHost()->SyncRendererPrefs();

+ web_contents->GetRenderViewHost()->AllowBindings(BINDINGS_POLICY_MOJO);

}

#if defined(ENABLE_WEBRTC)