Revert "Enable chrome.automation.getDesktop on all aura platforms."

chrome/browser/ui/ash/accessibility/ax_tree_source_ash_unittest.cc

Index: chrome/browser/ui/ash/accessibility/ax_tree_source_ash_unittest.cc
diff --git a/chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc b/chrome/browser/ui/ash/accessibility/ax_tree_source_ash_unittest.cc
similarity index 79%
rename from chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc
rename to chrome/browser/ui/ash/accessibility/ax_tree_source_ash_unittest.cc
index 2e06aebd67e7a0aa6915a3940999728316b6602e..2b42f5c4dc5b0cfb17ebb646e85da9ea37e5c054 100644
--- a/chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc
+++ b/chrome/browser/ui/ash/accessibility/ax_tree_source_ash_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "ash/test/ash_test_base.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/ui/aura/accessibility/ax_tree_source_aura.h"
+#include "chrome/browser/ui/ash/accessibility/ax_tree_source_ash.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/accessibility/ax_node.h"
@@ -39,10 +39,10 @@ size_t GetSize(AXAuraObjWrapper* tree) {
   return count;
 }
 
-class AXTreeSourceAuraTest : public ash::test::AshTestBase {
+class AXTreeSourceAshTest : public ash::test::AshTestBase {
  public:
-  AXTreeSourceAuraTest() {}
-  ~AXTreeSourceAuraTest() override {}
+  AXTreeSourceAshTest() {}
+  ~AXTreeSourceAshTest() override {}
 
   void SetUp() override {
     AshTestBase::SetUp();
@@ -66,11 +66,11 @@ class AXTreeSourceAuraTest : public ash::test::AshTestBase {
   Textfield* textfield_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(AXTreeSourceAuraTest);
+  DISALLOW_COPY_AND_ASSIGN(AXTreeSourceAshTest);
 };
 
-TEST_F(AXTreeSourceAuraTest, Accessors) {
-  AXTreeSourceAura ax_tree;
+TEST_F(AXTreeSourceAshTest, Accessors) {
+  AXTreeSourceAsh ax_tree;
   ASSERT_TRUE(ax_tree.GetRoot());
 
   // ID's should start at 1 and there should be a root.
@@ -102,45 +102,18 @@ TEST_F(AXTreeSourceAuraTest, Accessors) {
   ASSERT_EQ(ax_tree.GetRoot(), test_root);
 }
 
-TEST_F(AXTreeSourceAuraTest, DoDefault) {
-  AXTreeSourceAura ax_tree;
-
-  // Grab a wrapper to |DoDefault| (click).
-  AXAuraObjWrapper* textfield_wrapper =
-      AXAuraObjCache::GetInstance()->GetOrCreate(textfield_);
-
-  // Click and verify focus.
-  ASSERT_FALSE(textfield_->HasFocus());
-  textfield_wrapper->DoDefault();
-  ASSERT_TRUE(textfield_->HasFocus());
-}
-
-TEST_F(AXTreeSourceAuraTest, Focus) {
-  AXTreeSourceAura ax_tree;
-
-  // Grab a wrapper to focus.
-  AXAuraObjWrapper* textfield_wrapper =
-      AXAuraObjCache::GetInstance()->GetOrCreate(textfield_);
-
-  // Focus and verify.
-  ASSERT_FALSE(textfield_->HasFocus());
-  textfield_wrapper->Focus();
-  ASSERT_TRUE(textfield_->HasFocus());
-}
-
-TEST_F(AXTreeSourceAuraTest, Serialize) {
-  AXTreeSourceAura ax_tree;
+TEST_F(AXTreeSourceAshTest, Serialization) {
+  AXTreeSourceAsh ax_tree;
   ui::AXTreeSerializer<AXAuraObjWrapper*> ax_serializer(&ax_tree);
   ui::AXTreeUpdate out_update;
 
   // This is the initial serialization.
   ax_serializer.SerializeChanges(ax_tree.GetRoot(), &out_update);
 
-  // The update should just be the desktop node since no events have been fired
-  // on any controls, so no windows have been cached.
-  ASSERT_EQ(1U, out_update.nodes.size());
+  // We should get an update per node.
+  ASSERT_EQ(GetSize(ax_tree.GetRoot()), out_update.nodes.size());
 
-  // Try removing some child views and re-adding which should fire some events.
+  // Try removing some child views and re-adding.
   content_->RemoveAllChildViews(false /* delete_children */);
   content_->AddChildView(textfield_);
 
@@ -153,11 +126,38 @@ TEST_F(AXTreeSourceAuraTest, Serialize) {
   ui::AXTreeUpdate out_update2;
   ax_serializer.SerializeChanges(textfield_wrapper, &out_update2);
 
-  size_t node_count = out_update2.nodes.size();
+  // We should have far fewer updates this time around.
+  ASSERT_EQ(2U, out_update2.nodes.size());
+  ASSERT_EQ(ui::AX_ROLE_CLIENT,
+            out_update2.nodes[0].role);
 
-  // We should have far more updates this time around.
-  ASSERT_GE(node_count, 10U);
+  ASSERT_EQ(textfield_wrapper->GetID(), out_update2.nodes[1].id);
+  ASSERT_EQ(ui::AX_ROLE_TEXT_FIELD,
+            out_update2.nodes[1].role);
+}
+
+TEST_F(AXTreeSourceAshTest, DoDefault) {
+  AXTreeSourceAsh ax_tree;
+
+  // Grab a wrapper to |DoDefault| (click).
+  AXAuraObjWrapper* textfield_wrapper =
+      AXAuraObjCache::GetInstance()->GetOrCreate(textfield_);
 
-  ASSERT_EQ(textfield_wrapper->GetID(), out_update2.nodes[node_count - 1].id);
-  ASSERT_EQ(ui::AX_ROLE_TEXT_FIELD, out_update2.nodes[node_count - 1].role);
+  // Click and verify focus.
+  ASSERT_FALSE(textfield_->HasFocus());
+  textfield_wrapper->DoDefault();
+  ASSERT_TRUE(textfield_->HasFocus());
+}
+
+TEST_F(AXTreeSourceAshTest, Focus) {
+  AXTreeSourceAsh ax_tree;
+
+  // Grab a wrapper to focus.
+  AXAuraObjWrapper* textfield_wrapper =
+      AXAuraObjCache::GetInstance()->GetOrCreate(textfield_);
+
+  // Focus and verify.
+  ASSERT_FALSE(textfield_->HasFocus());
+  textfield_wrapper->Focus();
+  ASSERT_TRUE(textfield_->HasFocus());
 }