Move some AX attrs from AXNodeData to AXTreeData.

content/browser/accessibility/snapshot_ax_tree_browsertest.cc

 // Copyright 2015 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 "base/callback.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/accessibility/ax_node.h"
 #include "ui/accessibility/ax_tree.h"
 
 namespace content {
 
 namespace {
 
 class AXTreeSnapshotWaiter {
  public:
   AXTreeSnapshotWaiter() : loop_runner_(new MessageLoopRunner()) {}
 
   void Wait() {
     loop_runner_->Run();
   }
 
-  const SimpleAXTreeUpdate& snapshot() const { return snapshot_; }
+  const ui::AXTreeUpdate& snapshot() const { return snapshot_; }
 
-  void ReceiveSnapshot(const SimpleAXTreeUpdate& snapshot) {
+  void ReceiveSnapshot(const ui::AXTreeUpdate& snapshot) {
     snapshot_ = snapshot;
     loop_runner_->Quit();
   }
 
  private:
-  SimpleAXTreeUpdate snapshot_;
+  ui::AXTreeUpdate snapshot_;
   scoped_refptr<MessageLoopRunner> loop_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(AXTreeSnapshotWaiter);
 };
 
 }  // namespace
 
 class SnapshotAXTreeBrowserTest : public ContentBrowserTest {
  public:
   SnapshotAXTreeBrowserTest() {}
@@ skipping 22 matching lines @@
   ui::AXNode* root = tree.root();
   ASSERT_NE(nullptr, root);
   ASSERT_EQ(ui::AX_ROLE_ROOT_WEB_AREA, root->data().role);
   ui::AXNode* group = root->ChildAtIndex(0);
   ASSERT_EQ(ui::AX_ROLE_GROUP, group->data().role);
   ui::AXNode* button = group->ChildAtIndex(0);
   ASSERT_EQ(ui::AX_ROLE_BUTTON, button->data().role);
 }
 
 }  // namespace content