Refactor content/ to use ui::AXNodeData instead of blink.

content/renderer/accessibility/renderer_accessibility_complete.h

Index: content/renderer/accessibility/renderer_accessibility_complete.h
diff --git a/content/renderer/accessibility/renderer_accessibility_complete.h b/content/renderer/accessibility/renderer_accessibility_complete.h
index 2a6c2ddda4690fc3a6863cb1fe1cfbc418f99b2e..82dc2b61c934017920c239ee55c2fa686ccad2f1 100644
--- a/content/renderer/accessibility/renderer_accessibility_complete.h
+++ b/content/renderer/accessibility/renderer_accessibility_complete.h
@@ -10,11 +10,11 @@
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/weak_ptr.h"
-#include "content/common/accessibility_node_data.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/renderer/accessibility/renderer_accessibility.h"
 #include "third_party/WebKit/public/web/WebAXEnums.h"
 #include "third_party/WebKit/public/web/WebAXObject.h"
+#include "ui/accessibility/ax_node_data.h"
 
 namespace blink {
 class WebDocument;
@@ -47,6 +47,8 @@ class CONTENT_EXPORT RendererAccessibilityComplete
   virtual void HandleWebAccessibilityEvent(
       const blink::WebAXObject& obj, blink::WebAXEvent event) OVERRIDE;
 
+  void HandleAXEvent(const blink::WebAXObject& obj, ui::AXEvent event);
+
   // In order to keep track of what nodes the browser knows about, we keep a
   // representation of the browser tree - just IDs and parent/child
   // relationships.
@@ -77,7 +79,7 @@ class CONTENT_EXPORT RendererAccessibilityComplete
   // The set of ids serialized is added to |ids_serialized|, and any
   // ids previously in that set are not serialized again.
   void SerializeChangedNodes(const blink::WebAXObject& obj,
-                             std::vector<AccessibilityNodeData>* dst,
+                             std::vector<ui::AXNodeData>* dst,
                              std::set<int>* ids_serialized);
 
   // Clear the given node and recursively delete all of its descendants
@@ -102,14 +104,14 @@ class CONTENT_EXPORT RendererAccessibilityComplete
   // corresponding WebAccessibility node as a child of |dst|.
   void RecursiveAddEditableTextNodesToTree(
       const blink::WebAXObject& src,
-      AccessibilityNodeData* dst);
+      ui::AXNodeData* dst);
 
-  // Build a tree of serializable AccessibilityNodeData nodes to send to the
+  // Build a tree of serializable ui::AXNodeData nodes to send to the
   // browser process, given a WebAXObject node from WebKit.
   // Modifies |dst| in-place, it's assumed to be empty.
   void BuildAccessibilityTree(const blink::WebAXObject& src,
                               bool include_children,
-                              AccessibilityNodeData* dst);
+                              ui::AXNodeData* dst);
 
   // So we can queue up tasks to be executed later.
   base::WeakPtrFactory<RendererAccessibilityComplete> weak_factory_;
@@ -135,9 +137,6 @@ class CONTENT_EXPORT RendererAccessibilityComplete
   // Set if we are waiting for an accessibility event ack.
   bool ack_pending_;
 
-  // True if verbose logging of accessibility events is on.
-  bool logging_;
-
   DISALLOW_COPY_AND_ASSIGN(RendererAccessibilityComplete);
 };