accessibility: Simpler AXTree root accessor.

chrome/browser/extensions/api/automation/automation_apitest.cc

 // 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 "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/extensions/api/automation_internal/automation_util.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/browser/extensions/extension_apitest.h"
@@ skipping 219 matching lines @@
         tree0_version(0),
         tree1_version(0) {
   }
 
   // Serializes tree and sends it as an accessibility event to the extension.
   void SendDataForTree(const ui::AXTree* tree,
                        TreeSerializer* serializer,
                        int routing_id,
                        BrowserContext* browser_context) {
     ui::AXTreeUpdate update;
-    serializer->SerializeChanges(tree->GetRoot(), &update);
+    serializer->SerializeChanges(tree->root(), &update);
     SendUpdate(update,
                ui::AX_EVENT_LAYOUT_COMPLETE,
-               tree->GetRoot()->id(),
+               tree->root()->id(),
                routing_id,
                browser_context);
   }
 
   // Sends the given AXTreeUpdate to the extension as an accessibility event.
   void SendUpdate(ui::AXTreeUpdate update,
                   ui::AXEvent event,
                   int node_id,
                   int routing_id,
                   BrowserContext* browser_context) {
@@ skipping 137 matching lines @@
                    content::BrowserContext* browser_context) {
   source_serializer->ChangeTreeSourceForTesting(target_tree_source);
   for (int node_delta = 0; node_delta < state.tree_size; ++node_delta) {
     int id = 1 + (state.starting_node + node_delta) % state.tree_size;
     ui::AXTreeUpdate update;
     source_serializer->SerializeChanges(target_tree->GetFromId(id), &update);
     bool is_last_update = node_delta == state.tree_size - 1;
     ui::AXEvent event =
         is_last_update ? AX_EVENT_ASSERT_EQUAL : AX_EVENT_IGNORE;
     state.SendUpdate(
-        update, event, target_tree->GetRoot()->id(), kTab0Rid, browser_context);
+        update, event, target_tree->root()->id(), kTab0Rid, browser_context);
   }
 }
 
 // Helper method to send a no-op tree update to tab 0 with the given event.
 void SendEvent(ui::AXEvent event, content::BrowserContext* browser_context) {
   ui::AXTreeUpdate update;
-  ui::AXNode* root = state.tree0->GetRoot();
+  ui::AXNode* root = state.tree0->root();
   state.serializer0->SerializeChanges(root, &update);
   state.SendUpdate(update, event, root->id(), kTab0Rid, browser_context);
 }
 
 // Override for chrome.automationInternal.performAction
 // This is used as a synchronization mechanism; the general flow is:
 // 1. The extension requests tree0 and tree1 (on tab 0 and tab 1 respectively)
 // 2. FakeAutomationInternalEnableTabFunction sends down the trees
 // 3. When the callback for getTree(0) fires, the extension calls doDefault() on
 //    the root node of tree0, which calls into this class's Run() method.
@@ skipping 93 matching lines @@
       "automationInternal.enableTab",
       FakeAutomationInternalEnableTabFunctionFactory));
   ASSERT_TRUE(extensions::ExtensionFunctionDispatcher::OverrideFunction(
       "automationInternal.performAction",
       FakeAutomationInternalPerformActionFunctionFactory));
   ASSERT_TRUE(RunExtensionSubtest("automation/tests/generated",
                                   "generated_trees.html")) << message_;
 }
 
 }  // namespace extensions