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

chrome/browser/ui/ash/accessibility/ax_tree_source_ash_unittest.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 <vector>
 
 #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"
 #include "ui/accessibility/ax_serializable_tree.h"
 #include "ui/accessibility/ax_tree_serializer.h"
 #include "ui/accessibility/ax_tree_update.h"
 #include "ui/aura/window.h"
 #include "ui/views/accessibility/ax_aura_obj_cache.h"
 #include "ui/views/accessibility/ax_aura_obj_wrapper.h"
 #include "ui/views/controls/textfield/textfield.h"
@@ skipping 12 matching lines @@
 
   std::vector<AXAuraObjWrapper*> out_children;
   tree->GetChildren(&out_children);
 
   for (size_t i = 0; i < out_children.size(); ++i)
     count += GetSize(out_children[i]);
 
   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();
 
     widget_ = new Widget();
     Widget::InitParams init_params(Widget::InitParams::TYPE_POPUP);
     init_params.parent = CurrentContext();
     widget_->Init(init_params);
 
     content_ = new View();
     widget_->SetContentsView(content_);
 
     textfield_ = new Textfield();
     textfield_->SetText(base::ASCIIToUTF16("Value"));
     content_->AddChildView(textfield_);
   }
 
  protected:
   Widget* widget_;
   View* content_;
   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.
   ASSERT_EQ(1, ax_tree.GetRoot()->GetID());
 
   // Grab the content view directly from cache to avoid walking down the tree.
   AXAuraObjWrapper* content =
       AXAuraObjCache::GetInstance()->GetOrCreate(content_);
   std::vector<AXAuraObjWrapper*> content_children;
   ax_tree.GetChildren(content, &content_children);
@@ skipping 11 matching lines @@
   ASSERT_EQ(content, textfield->GetParent());
 
   // Try walking up the tree to the root.
   AXAuraObjWrapper* test_root = NULL;
   for (AXAuraObjWrapper* root_finder = ax_tree.GetParent(content); root_finder;
        root_finder = ax_tree.GetParent(root_finder))
     test_root = root_finder;
   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_);
 
   // Grab the textfield since serialization only walks up the tree (not down
   // from root).
   AXAuraObjWrapper* textfield_wrapper =
       AXAuraObjCache::GetInstance()->GetOrCreate(textfield_);
 
   // Now, re-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);
+}
 
-  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);
+TEST_F(AXTreeSourceAshTest, DoDefault) {
+  AXTreeSourceAsh 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(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());
+}