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

content/shell/browser/layout_test/blink_test_controller.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 "content/shell/browser/layout_test/blink_test_controller.h"
 
 #include <stddef.h>
 
 #include <iostream>
 #include <set>
@@ skipping 564 matching lines @@
         FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
     test_phase_ = CLEAN_UP;
   } else if (main_window_) {
     main_window_->Close();
   }
   main_window_ = NULL;
   current_pid_ = base::kNullProcessId;
 }
 
 void BlinkTestController::HandleNewRenderFrameHost(RenderFrameHost* frame) {
-  // All RenderViewHosts in layout tests should get Mojo bindings.
-  RenderViewHost* rvh = frame->GetRenderViewHost();
-  if (!(rvh->GetEnabledBindings() & BINDINGS_POLICY_MOJO))
-    rvh->AllowBindings(BINDINGS_POLICY_MOJO);
+  // All RenderFrameHosts in layout tests should get Mojo bindings.
+  if (!(frame->GetEnabledBindings() & BINDINGS_POLICY_MOJO))
+    frame->AllowBindings(BINDINGS_POLICY_MOJO);
 
   RenderProcessHost* process = frame->GetProcess();
   bool main_window =
       WebContents::FromRenderFrameHost(frame) == main_window_->web_contents();
 
   // Track pid of the renderer handling the main frame.
   if (main_window && frame->GetParent() == nullptr) {
     base::ProcessHandle process_handle = process->GetHandle();
     if (process_handle != base::kNullProcessHandle)
       current_pid_ = base::GetProcId(process_handle);
@@ skipping 348 matching lines @@
   } else {
     printer_->AddErrorMessage(base::StringPrintf(
         "FAIL: Unexpected sendBluetoothManualChooserEvent() event name '%s'.",
         event_name.c_str()));
     return;
   }
   bluetooth_chooser_factory_->SendEvent(event, argument);
 }
 
 }  // namespace content