Reland 244394 - Convert DomAutomationController from CppBoundClass to...

content/renderer/render_view_impl.cc

 // Copyright (c) 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/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 3636 matching lines @@
           RenderViewNavigatedToHost(GURL(GetLoadingUrl(frame)).host(),
                                     g_view_map.Get().size());
     }
   }
 }
 
 void RenderViewImpl::didClearWindowObject(WebFrame* frame, int world_id) {
   FOR_EACH_OBSERVER(RenderViewObserver, observers_,
                     DidClearWindowObject(frame, world_id));
 
-  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");
-  }
+  if (enabled_bindings_ & BINDINGS_POLICY_DOM_AUTOMATION && world_id == 0)

[Mike West, 2014/01/13 11:41:35]

Bitwise AND binds tighter than logical AND? I hope?

+    DomAutomationController::Install(frame);
 
-   if (enabled_bindings_ & BINDINGS_POLICY_STATS_COLLECTION)
-     StatsCollectionController::Install(frame);
+  if (enabled_bindings_ & BINDINGS_POLICY_STATS_COLLECTION)
+    StatsCollectionController::Install(frame);
 }
 
 void RenderViewImpl::didCreateDocumentElement(WebFrame* frame) {
   FOR_EACH_OBSERVER(RenderViewObserver, observers_,
                     DidCreateDocumentElement(frame));
 }
 
 void RenderViewImpl::didReceiveTitle(WebFrame* frame, const WebString& title,
                                      WebTextDirection direction) {
   UpdateTitle(frame, title, direction);
@@ skipping 2690 matching lines @@
   for (size_t i = 0; i < icon_urls.size(); i++) {
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url,
                                 ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content