Enable chrome.automation.getDesktop on all aura platforms.

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

Index: chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc
diff --git a/chrome/browser/ui/ash/accessibility/ax_tree_source_ash_unittest.cc b/chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc
similarity index 68%
rename from chrome/browser/ui/ash/accessibility/ax_tree_source_ash_unittest.cc
rename to chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc
index 2b42f5c4dc5b0cfb17ebb646e85da9ea37e5c054..a0b1c3568b8b8a68123fb460d9c2684cac902cd8 100644
--- a/chrome/browser/ui/ash/accessibility/ax_tree_source_ash_unittest.cc
+++ b/chrome/browser/ui/ash/accessibility/ax_tree_source_aura_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "ash/test/ash_test_base.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/ui/ash/accessibility/ax_tree_source_ash.h"
+#include "chrome/browser/ui/aura/accessibility/ax_tree_source_aura.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 AXTreeSourceAshTest : public ash::test::AshTestBase {
+class AXTreeSourceAuraTest : public ash::test::AshTestBase {
  public:
-  AXTreeSourceAshTest() {}
-  ~AXTreeSourceAshTest() override {}
+  AXTreeSourceAuraTest() {}
+  ~AXTreeSourceAuraTest() override {}
 
   void SetUp() override {
     AshTestBase::SetUp();
@@ -66,11 +66,11 @@ class AXTreeSourceAshTest : public ash::test::AshTestBase {
   Textfield* textfield_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(AXTreeSourceAshTest);
+  DISALLOW_COPY_AND_ASSIGN(AXTreeSourceAuraTest);
 };
 
-TEST_F(AXTreeSourceAshTest, Accessors) {
-  AXTreeSourceAsh ax_tree;
+TEST_F(AXTreeSourceAuraTest, Accessors) {
+  AXTreeSourceAura ax_tree;
   ASSERT_TRUE(ax_tree.GetRoot());
 
   // ID's should start at 1 and there should be a root.
@@ -102,42 +102,8 @@ TEST_F(AXTreeSourceAshTest, Accessors) {
   ASSERT_EQ(ax_tree.GetRoot(), test_root);
 }
 
-TEST_F(AXTreeSourceAshTest, Serialization) {

[dmazzoni, 2015/03/26 18:44:58]

Are we losing this test too?

[David Tseng, 2015/03/26 23:20:47]

Fixed this one.

-  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);
-
-  // 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.
-  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);
-
-  // 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);
-
-  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;
+TEST_F(AXTreeSourceAuraTest, DoDefault) {
+  AXTreeSourceAura ax_tree;
 
   // Grab a wrapper to |DoDefault| (click).
   AXAuraObjWrapper* textfield_wrapper =
@@ -149,8 +115,8 @@ TEST_F(AXTreeSourceAshTest, DoDefault) {
   ASSERT_TRUE(textfield_->HasFocus());
 }
 
-TEST_F(AXTreeSourceAshTest, Focus) {
-  AXTreeSourceAsh ax_tree;
+TEST_F(AXTreeSourceAuraTest, Focus) {
+  AXTreeSourceAura ax_tree;
 
   // Grab a wrapper to focus.
   AXAuraObjWrapper* textfield_wrapper =