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

Unified Diff: content/browser/frame_host/render_frame_host_manager_browsertest.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: self review Created 5 years, 1 month 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
Index: content/browser/frame_host/render_frame_host_manager_browsertest.cc
diff --git a/content/browser/frame_host/render_frame_host_manager_browsertest.cc b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
index af01878df6a79eb4ff08918d3cce0ffe380b0153..5a4b410a8dc86a3949d502698bc751e010813e43 100644
--- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
@@ -1828,15 +1828,15 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, WebUIGetsBindings) {
GetRenderManagerForTesting()->GetSwappedOutRenderViewHost(site_instance1);
ASSERT_TRUE(initial_rvh);
// The following condition is what was causing the bug.
- EXPECT_EQ(0, initial_rvh->GetEnabledBindings());
+ EXPECT_FALSE(initial_rvh->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI);
// Navigate to url1 and check bindings.
NavigateToURL(new_shell, url1);
// The navigation should have used the first SiteInstance, otherwise
// |initial_rvh| did not have a chance to be used.
EXPECT_EQ(new_web_contents->GetSiteInstance(), site_instance1);
- EXPECT_EQ(BINDINGS_POLICY_WEB_UI,
- new_web_contents->GetRenderViewHost()->GetEnabledBindings());
+ EXPECT_TRUE(new_web_contents->GetRenderViewHost()
+ ->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI);
}
// crbug.com/424526

Powered by Google App Engine
This is Rietveld 408576698