Use correct WebView from AccessibilityController.

components/test_runner/accessibility_controller.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/test_runner/accessibility_controller.h"
 
 #include "base/macros.h"
+#include "components/test_runner/web_test_proxy.h"
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"
 #include "gin/wrappable.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebKit.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebSettings.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 namespace test_runner {
 
 class AccessibilityControllerBindings
     : public gin::Wrappable<AccessibilityControllerBindings> {
  public:
   static gin::WrapperInfo kWrapperInfo;
 
   static void Install(base::WeakPtr<AccessibilityController> controller,
-                      blink::WebFrame* frame);
+                      blink::WebLocalFrame* frame);
 
  private:
   explicit AccessibilityControllerBindings(
       base::WeakPtr<AccessibilityController> controller);
   ~AccessibilityControllerBindings() override;
 
   // gin::Wrappable:
   gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
       v8::Isolate* isolate) override;
 
   void LogAccessibilityEvents();
   void SetNotificationListener(v8::Local<v8::Function> callback);
   void UnsetNotificationListener();
   v8::Local<v8::Object> FocusedElement();
   v8::Local<v8::Object> RootElement();
   v8::Local<v8::Object> AccessibleElementById(const std::string& id);
 
   base::WeakPtr<AccessibilityController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(AccessibilityControllerBindings);
 };
 
 gin::WrapperInfo AccessibilityControllerBindings::kWrapperInfo = {
     gin::kEmbedderNativeGin};
 
 // static
 void AccessibilityControllerBindings::Install(
     base::WeakPtr<AccessibilityController> controller,
-    blink::WebFrame* frame) {
+    blink::WebLocalFrame* frame) {
   v8::Isolate* isolate = blink::mainThreadIsolate();
   v8::HandleScope handle_scope(isolate);
   v8::Local<v8::Context> context = frame->mainWorldScriptContext();
   if (context.IsEmpty())
     return;
 
   v8::Context::Scope context_scope(context);
 
   gin::Handle<AccessibilityControllerBindings> bindings =
       gin::CreateHandle(isolate,
@@ skipping 60 matching lines @@
 v8::Local<v8::Object> AccessibilityControllerBindings::RootElement() {
   return controller_ ? controller_->RootElement() : v8::Local<v8::Object>();
 }
 
 v8::Local<v8::Object> AccessibilityControllerBindings::AccessibleElementById(
     const std::string& id) {
   return controller_ ? controller_->AccessibleElementById(id)
                      : v8::Local<v8::Object>();
 }
 
-AccessibilityController::AccessibilityController()
+AccessibilityController::AccessibilityController(
+    WebTestProxyBase* web_test_proxy_base)
     : log_accessibility_events_(false),
-      weak_factory_(this) {
-}
+      web_test_proxy_base_(web_test_proxy_base),
+      weak_factory_(this) {}
 
 AccessibilityController::~AccessibilityController() {}
 
 void AccessibilityController::Reset() {
   elements_.Clear();
   notification_callback_.Reset();
   log_accessibility_events_ = false;
 }
 
-void AccessibilityController::Install(blink::WebFrame* frame) {
+void AccessibilityController::Install(blink::WebLocalFrame* frame) {
   frame->view()->settings()->setAccessibilityEnabled(true);
   frame->view()->settings()->setInlineTextBoxAccessibilityEnabled(true);
 
   AccessibilityControllerBindings::Install(weak_factory_.GetWeakPtr(), frame);
 }
 
 bool AccessibilityController::ShouldLogAccessibilityEvents() {
   return log_accessibility_events_;
 }
 
 void AccessibilityController::NotificationReceived(
     const blink::WebAXObject& target, const std::string& notification_name) {
   v8::Isolate* isolate = blink::mainThreadIsolate();
   v8::HandleScope handle_scope(isolate);
 
-  blink::WebFrame* frame = web_view_->mainFrame();
+  blink::WebFrame* frame = web_view()->mainFrame();
   if (!frame || frame->isWebRemoteFrame())
     return;
 
   v8::Local<v8::Context> context = frame->mainWorldScriptContext();
   if (context.IsEmpty())
     return;
 
   v8::Context::Scope context_scope(context);
 
   // Call notification listeners on the element.
@@ skipping 16 matching lines @@
                             v8::String::kNormalString,
                             notification_name.size()),
   };
   frame->callFunctionEvenIfScriptDisabled(
       v8::Local<v8::Function>::New(isolate, notification_callback_),
       context->Global(),
       arraysize(argv),
       argv);
 }
 
-void AccessibilityController::SetDelegate(WebTestDelegate* delegate) {
-  delegate_ = delegate;
-}
-
-void AccessibilityController::SetWebView(blink::WebView* web_view) {
-  web_view_ = web_view;
-}
-
 void AccessibilityController::LogAccessibilityEvents() {
   log_accessibility_events_ = true;
 }
 
 void AccessibilityController::SetNotificationListener(
     v8::Local<v8::Function> callback) {
   v8::Isolate* isolate = blink::mainThreadIsolate();
   notification_callback_.Reset(isolate, callback);
 }
 
 void AccessibilityController::UnsetNotificationListener() {
   notification_callback_.Reset();
 }
 
 v8::Local<v8::Object> AccessibilityController::FocusedElement() {
-  blink::WebFrame* frame = web_view_->mainFrame();
+  blink::WebFrame* frame = web_view()->mainFrame();
   if (!frame)
     return v8::Local<v8::Object>();
 
   blink::WebAXObject focused_element =
       frame->document().focusedAccessibilityObject();
   if (focused_element.isNull())
-    focused_element = web_view_->accessibilityObject();
+    focused_element = web_view()->accessibilityObject();
   return elements_.GetOrCreate(focused_element);
 }
 
 v8::Local<v8::Object> AccessibilityController::RootElement() {
-  blink::WebAXObject root_element = web_view_->accessibilityObject();
+  blink::WebAXObject root_element = web_view()->accessibilityObject();
   return elements_.GetOrCreate(root_element);
 }
 
 v8::Local<v8::Object>
 AccessibilityController::AccessibleElementById(const std::string& id) {
-  blink::WebAXObject root_element = web_view_->accessibilityObject();
+  blink::WebAXObject root_element = web_view()->accessibilityObject();
 
   if (!root_element.updateLayoutAndCheckValidity())
     return v8::Local<v8::Object>();
 
   return FindAccessibleElementByIdRecursive(
       root_element, blink::WebString::fromUTF8(id.c_str()));
 }
 
 v8::Local<v8::Object>
 AccessibilityController::FindAccessibleElementByIdRecursive(
@@ skipping 13 matching lines @@
   for (unsigned i = 0; i < childCount; i++) {
     v8::Local<v8::Object> result =
         FindAccessibleElementByIdRecursive(obj.childAt(i), id);
     if (*result)
       return result;
   }
 
   return v8::Local<v8::Object>();
 }
 
+blink::WebView* AccessibilityController::web_view() {
+  return web_test_proxy_base_->web_view();
+}
+
 }  // namespace test_runner