Move some AX attrs from AXNodeData to AXTreeData.

content/browser/accessibility/one_shot_accessibility_tree_search_unittest.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/memory/scoped_ptr.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/one_shot_accessibility_tree_search.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 namespace {
 
 class TestBrowserAccessibilityManager : public BrowserAccessibilityManager {
  public:
   TestBrowserAccessibilityManager(
-      const SimpleAXTreeUpdate& initial_tree)
+      const ui::AXTreeUpdate& initial_tree)
       : BrowserAccessibilityManager(initial_tree,
                                     nullptr,
                                     new BrowserAccessibilityFactory()) {}
 };
 
 }  // namespace
 
 // These tests prevent other tests from being run. crbug.com/514632
 #if defined(ANDROID) && defined(ADDRESS_SANITIZER)
 #define MAYBE_OneShotAccessibilityTreeSearchTest DISABLED_OneShotAccessibilityTreeSearchTets
@@ skipping 186 matching lines @@
   search.AddPredicate([](BrowserAccessibility* start,
                          BrowserAccessibility* current) {
     return (current->GetId() % 2 == 1);
   });
   ASSERT_EQ(2U, search.CountMatches());
   EXPECT_EQ(3, search.GetMatchAtIndex(0)->GetId());
   EXPECT_EQ(5, search.GetMatchAtIndex(1)->GetId());
 }
 
 }  // namespace content