Switch DomAutomationController to be a RenderFrameObserver.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 6106e97b4bf119eafca78434c351a2392c022783..dfc7540d4ae8585685f7717e56f5b6a822991190 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -22,6 +22,7 @@
 #include "content/common/socket_stream_handle_data.h"
 #include "content/common/swapped_out_messages.h"
 #include "content/common/view_messages.h"
+#include "content/public/common/bindings_policy.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/context_menu_params.h"
@@ -37,6 +38,7 @@
 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
 #include "content/renderer/child_frame_compositing_helper.h"
 #include "content/renderer/context_menu_params_builder.h"
+#include "content/renderer/dom_automation_controller.h"
 #include "content/renderer/internal_document_state_data.h"
 #include "content/renderer/npapi/plugin_channel_host.h"
 #include "content/renderer/render_thread_impl.h"
@@ -1079,6 +1081,14 @@ void RenderFrameImpl::didClearWindowObject(blink::WebFrame* frame,
   // * enabled_bindings_
   // * dom_automation_controller_
   // * stats_collection_controller_
+
+  if (!world_id) {

[nasko, 2014/02/11 17:32:33]

nit: Why not keep the pattern from the RV version of the method? I assume we
will eventually move all the code from the other method to here.

+    // Only install controllers into the main world.
+    if (render_view_->GetEnabledBindings() & BINDINGS_POLICY_DOM_AUTOMATION) {
+      DomAutomationController::Install(this, frame);
+    }
+  }
+
   render_view_->didClearWindowObject(frame, world_id);
 }