Change allowed bindings to be per RenderFrame instead of per RenderView.

content/browser/frame_host/render_frame_host_manager_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 
@@ skipping 1813 matching lines @@
   WebContentsImpl* new_web_contents = static_cast<WebContentsImpl*>(
       new_shell->web_contents());
   SiteInstance* site_instance2 = new_web_contents->GetSiteInstance();
 
   EXPECT_NE(site_instance2, site_instance1);
   EXPECT_TRUE(site_instance2->IsRelatedSiteInstance(site_instance1));
   RenderViewHost* initial_rvh = new_web_contents->
       GetRenderManagerForTesting()->GetSwappedOutRenderViewHost(site_instance1);
   ASSERT_TRUE(initial_rvh);
   // The following condition is what was causing the bug.
-  EXPECT_EQ(0, initial_rvh->GetEnabledBindings());
+  // EXPECT_EQ(0, initial_rvh->GetMainFrame()->GetEnabledBindings());

[Charlie Reis, 2017/01/18 22:18:43]

Ok.  Can we replace it with an EXPECT_FALSE version of the HasWebUIBindings
check on line 1812, so that we're checking the process instead?

If so, let's do that.  If not, just remove these two lines rather than have them
commented out (or maybe leave a comment saying what the bug used to be).

[Sam McNally, 2017/01/19 05:30:37]

No, that's true since both webui WebContents end up in the same renderer
process, and process was granted the webui bindings for the first WebContents.

[Charlie Reis, 2017/01/19 17:58:55]

Acknowledged.

 
   // 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());
+            new_web_contents->GetMainFrame()->GetEnabledBindings());
 }
 
 // crbug.com/424526
 // The test loads a WebUI page in process-per-tab mode, then navigates to a
 // blank page and then to a regular page. The bug reproduces if blank page is
 // visited in between WebUI and regular page.
 IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        ForceSwapAfterWebUIBindings) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kProcessPerTab);
@@ skipping 1172 matching lines @@
   // the iframe's old RFH still has correct origin, even though it's pending
   // deletion.
   if (AreAllSitesIsolatedForTesting()) {
     EXPECT_FALSE(child_rfh_b->is_active());
     EXPECT_NE(child_rfh_b, child->current_frame_host());
     EXPECT_EQ(url::Origin(url_b), child_rfh_b->GetLastCommittedOrigin());
   }
 }
 
 }  // namespace content