Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 0faf36066e10857dc89878d83f761325abf07c14..39d660e8493790002b17c1e4f5ce92b3080516bb 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -871,6 +871,7 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params) |
handling_select_range_(false), |
next_snapshot_id_(0), |
allow_partial_swap_(params->allow_partial_swap), |
+ dom_automation_controller_(NULL), |
context_menu_source_type_(ui::MENU_SOURCE_MOUSE) { |
} |
@@ -3667,12 +3668,8 @@ void RenderViewImpl::didClearWindowObject(WebFrame* frame) { |
if (enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION) { |
if (!dom_automation_controller_) |
- dom_automation_controller_.reset(new DomAutomationController()); |
- dom_automation_controller_->set_message_sender( |
- static_cast<RenderView*>(this)); |
- dom_automation_controller_->set_routing_id(routing_id()); |
- dom_automation_controller_->BindToJavascript(frame, |
- "domAutomationController"); |
+ dom_automation_controller_ = new DomAutomationController(this); |
+ dom_automation_controller_->Install(frame); |
} |
if (enabled_bindings_ & BINDINGS_POLICY_STATS_COLLECTION) |