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

content/browser/renderer_host/render_view_host_unittest.cc

 // Copyright (c) 2012 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 <stdint.h>
 
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/child_process_security_policy_impl.h"
@@ skipping 70 matching lines @@
   int32_t routing_id = process()->GetNextRoutingID();
   test_rvh()->CreateNewFullscreenWidget(routing_id);
 }
 
 // Ensure we do not grant bindings to a process shared with unprivileged views.
 TEST_F(RenderViewHostTest, DontGrantBindingsToSharedProcess) {
   // Create another view in the same process.
   std::unique_ptr<TestWebContents> new_web_contents(
       TestWebContents::Create(browser_context(), rvh()->GetSiteInstance()));
 
-  rvh()->AllowBindings(BINDINGS_POLICY_WEB_UI);
-  EXPECT_FALSE(rvh()->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI);
+  rvh()->GetMainFrame()->AllowBindings(BINDINGS_POLICY_WEB_UI);

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

main_rfh() here as well.

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

Done.

+  EXPECT_FALSE(rvh()->GetMainFrame()->GetEnabledBindings() &
+               BINDINGS_POLICY_WEB_UI);
 }
 
 class MockDraggingRenderViewHostDelegateView
     : public RenderViewHostDelegateView {
  public:
   ~MockDraggingRenderViewHostDelegateView() override {}
   void StartDragging(const DropData& drop_data,
                      blink::WebDragOperationsMask allowed_ops,
                      const gfx::ImageSkia& image,
                      const gfx::Vector2d& image_offset,
@@ skipping 204 matching lines @@
   const std::string data_url = "data:image/gif;base64,"
       "R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs=";
 
   tester->Reset();
   tester->Test(data_url);
   EXPECT_EQ(tester->UrlString(), data_url);
   EXPECT_TRUE(tester->IsDownloaded());
 }
 
 }  // namespace content