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

content/renderer/web_ui_extension.cc

 // Copyright 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 "content/renderer/web_ui_extension.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "content/common/view_messages.h"
 #include "content/public/child/v8_value_converter.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/chrome_object_extensions_utils.h"
+#include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "content/renderer/web_ui_extension_data.h"
 #include "gin/arguments.h"
 #include "gin/function_template.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 #include "third_party/WebKit/public/web/WebView.h"
@@ skipping 10 matching lines @@
   blink::WebFrame* frame = blink::WebLocalFrame::frameForCurrentContext();
   if (!frame || !frame->view())
     return false;
 
   RenderView* render_view = RenderView::FromWebView(frame->view());
   if (!render_view)
     return false;
 
   GURL frame_url = frame->document().url();
 
+  RenderFrame* render_frame = render_view->GetMainRenderFrame();

[Charlie Reis, 2016/12/16 01:01:52]

Is this wrong?  The frame_ptr passed in might not be the main frame.  I would
guess that we should be using RenderFrame::FromWebFrame(frame) instead.

[Sam McNally, 2017/01/12 09:27:09]

Done.

+  if (!render_frame)
+    return false;
+
   bool webui_enabled =
-      (render_view->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI) &&
+      (render_frame->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI) &&
       (frame_url.SchemeIs(kChromeUIScheme) ||
        frame_url.SchemeIs(url::kDataScheme));
 
   if (!webui_enabled)
     return false;
 
   *frame_ptr = frame;
   *render_view_ptr = render_view;
   return true;
 }
@@ skipping 58 matching lines @@
       return;
     }
 
     std::unique_ptr<V8ValueConverter> converter(V8ValueConverter::create());
     content = base::ListValue::From(
         converter->FromV8Value(obj, frame->mainWorldScriptContext()));
     DCHECK(content);
   }
 
   // Send the message up to the browser.
   render_view->Send(new ViewHostMsg_WebUISend(render_view->GetRoutingID(),

[Charlie Reis, 2016/12/16 01:01:52]

I suppose this class will need conversion soon as well.  Will it be safe in the
meantime?

[Sam McNally, 2017/01/12 09:27:09]

I think so.

                                               frame->document().url(),
                                               message,
                                               *content));
 }
 
 // static
 std::string WebUIExtension::GetVariableValue(const std::string& name) {
   blink::WebFrame* frame;
   RenderView* render_view;
   if (!ShouldRespondToRequest(&frame, &render_view))
     return std::string();
 
   return WebUIExtensionData::Get(render_view)->GetValue(name);
 }
 
 }  // namespace content