Revert of Rename AXObject to AXObjectImpl in modules/ and web/ (patchset #9 id:160001 of https://co…

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

Index: third_party/WebKit/Source/modules/accessibility/InspectorTypeBuilderHelper.cpp
diff --git a/third_party/WebKit/Source/modules/accessibility/InspectorTypeBuilderHelper.cpp b/third_party/WebKit/Source/modules/accessibility/InspectorTypeBuilderHelper.cpp
index 18e16d3d3810a3d24900eed2af639c154c978258..4eb03f24c9f4611ba5b1f0347a025f1502a086c5 100644
--- a/third_party/WebKit/Source/modules/accessibility/InspectorTypeBuilderHelper.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/InspectorTypeBuilderHelper.cpp
@@ -5,8 +5,8 @@
 #include "modules/accessibility/InspectorTypeBuilderHelper.h"
 
 #include "core/dom/DOMNodeIds.h"
+#include "modules/accessibility/AXObject.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
-#include "modules/accessibility/AXObjectImpl.h"
 
 namespace blink {
 
@@ -97,9 +97,8 @@ std::unique_ptr<AXValue> CreateBooleanValue(bool value, const String& type) {
       .build();
 }
 
-std::unique_ptr<AXRelatedNode> RelatedNodeForAXObject(
-    const AXObjectImpl& ax_object,
-    String* name = nullptr) {
+std::unique_ptr<AXRelatedNode> RelatedNodeForAXObject(const AXObject& ax_object,
+                                                      String* name = nullptr) {
   Node* node = ax_object.GetNode();
   if (!node)
     return nullptr;
@@ -121,10 +120,9 @@ std::unique_ptr<AXRelatedNode> RelatedNodeForAXObject(
   return related_node;
 }
 
-std::unique_ptr<AXValue> CreateRelatedNodeListValue(
-    const AXObjectImpl& ax_object,
-    String* name,
-    const String& value_type) {
+std::unique_ptr<AXValue> CreateRelatedNodeListValue(const AXObject& ax_object,
+                                                    String* name,
+                                                    const String& value_type) {
   std::unique_ptr<protocol::Array<AXRelatedNode>> related_nodes =
       protocol::Array<AXRelatedNode>::create();
   related_nodes->addItem(RelatedNodeForAXObject(ax_object, name));
@@ -153,7 +151,7 @@ std::unique_ptr<AXValue> CreateRelatedNodeListValue(
 }
 
 std::unique_ptr<AXValue> CreateRelatedNodeListValue(
-    AXObjectImpl::AXObjectVector& ax_objects,
+    AXObject::AXObjectVector& ax_objects,
     const String& value_type) {
   std::unique_ptr<protocol::Array<AXRelatedNode>> related_nodes =
       protocol::Array<AXRelatedNode>::create();