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

components/dom_distiller/content/browser/dom_distiller_viewer_source.cc

 // Copyright 2014 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 "components/dom_distiller/content/browser/dom_distiller_viewer_source.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 16 matching lines @@
 #include "components/dom_distiller/core/experiments.h"
 #include "components/dom_distiller/core/feedback_reporter.h"
 #include "components/dom_distiller/core/task_tracker.h"
 #include "components/dom_distiller/core/url_constants.h"
 #include "components/dom_distiller/core/url_utils.h"
 #include "components/dom_distiller/core/viewer.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
-#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "grit/components_strings.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "net/base/url_util.h"
 #include "net/url_request/url_request.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 89 matching lines @@
 
   const GURL& navigation = navigation_handle->GetURL();
   bool expected_main_view_request =
       navigation.SchemeIs(expected_scheme_.c_str()) &&
       expected_request_path_ == navigation.query();
   if (navigation_handle->IsSamePage() || expected_main_view_request) {
     // In-page navigations, as well as the main view request can be ignored.
     if (expected_main_view_request) {
       content::RenderFrameHost* render_frame_host =
           navigation_handle->GetRenderFrameHost();
-      content::RenderViewHost* render_view_host =
-          render_frame_host->GetRenderViewHost();
-      CHECK_EQ(0, render_view_host->GetEnabledBindings());
+      CHECK_EQ(0, render_frame_host->GetEnabledBindings());
 
       // Add mojo service for JavaScript functionality. This is the receiving
       // end of this particular service.
       render_frame_host->GetInterfaceRegistry()->AddInterface(
           base::Bind(&CreateDistillerJavaScriptService,
               render_frame_host,
               distiller_ui_handle_));
 
       // Tell the renderer that this is currently a distilled page.
       mojom::DistillerPageNotifierServicePtr page_notifier_service;
@@ skipping 146 matching lines @@
 std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc()
     const {
   return "style-src 'self' https://fonts.googleapis.com;";
 }
 
 std::string DomDistillerViewerSource::GetContentSecurityPolicyChildSrc() const {
   return "child-src *;";
 }
 
 }  // namespace dom_distiller