[DevTools] Move from InstrumentingAgents to InstrumentingSessions.

third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.cpp

 // 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 "modules/accessibility/InspectorAccessibilityAgent.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/AXObjectCache.h"
 #include "core/dom/DOMNodeIds.h"
 #include "core/dom/Element.h"
@@ skipping 340 matching lines @@
     } else {
         nodeObject->setProperties(properties);
     }
 
     fillCoreProperties(axObject, nodeObject.get());
     return nodeObject.release();
 }
 
 } // namespace
 
-InspectorAccessibilityAgent::InspectorAccessibilityAgent(Page* page)
+InspectorAccessibilityAgent::InspectorAccessibilityAgent(Page* page, InspectorDOMAgent* domAgent)
     : InspectorBaseAgent<InspectorAccessibilityAgent, protocol::Frontend::Accessibility>("Accessibility")
     , m_page(page)
+    , m_domAgent(domAgent)
 {
 }
 
 void InspectorAccessibilityAgent::getAXNode(ErrorString* errorString, int nodeId, Maybe<AXNode>* accessibilityNode)
 {
     Frame* mainFrame = m_page->mainFrame();
     if (!mainFrame->isLocalFrame()) {
         *errorString = "Can't inspect out of process frames yet";
         return;
     }
 
-    InspectorDOMAgent* domAgent = toLocalFrame(mainFrame)->instrumentingAgents()->inspectorDOMAgent();
-    if (!domAgent) {
+    if (!m_domAgent->enabled()) {
         *errorString = "DOM agent must be enabled";
         return;
     }
-    Node* node = domAgent->assertNode(errorString, nodeId);
+    Node* node = m_domAgent->assertNode(errorString, nodeId);
     if (!node)
         return;
 
     Document& document = node->document();
     OwnPtr<ScopedAXObjectCache> cache = ScopedAXObjectCache::create(document);
     AXObjectCacheImpl* cacheImpl = toAXObjectCacheImpl(cache->get());
     AXObject* axObject = cacheImpl->getOrCreate(node);
     if (!axObject || axObject->accessibilityIsIgnored()) {
         *accessibilityNode = buildObjectForIgnoredNode(node, axObject, cacheImpl);
         return;
     }
 
     OwnPtr<protocol::Array<AXProperty>> properties = protocol::Array<AXProperty>::create();
     fillLiveRegionProperties(axObject, properties.get());
     fillGlobalStates(axObject, properties.get());
     fillWidgetProperties(axObject, properties.get());
     fillWidgetStates(axObject, properties.get());
     fillRelationships(axObject, properties.get());
 
     *accessibilityNode = buildObjectForNode(node, axObject, cacheImpl, properties.release());
 }
 
 DEFINE_TRACE(InspectorAccessibilityAgent)
 {
     visitor->trace(m_page);
+    visitor->trace(m_domAgent);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink