Add DCHECK to BrowserAccessibilityManager::Remove to detect undefined behavoir that may lead to a...

chrome/browser/accessibility/browser_accessibility_manager_unittest.cc

 // Copyright (c) 2011 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/string16.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/common/view_messages.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 580 matching lines @@
   // Save for later comparison.
   BrowserAccessibility* acc1_2 = manager->GetFromRendererID(1001);
 
   // Verify the root has not changed.
   EXPECT_EQ(root, manager->GetRoot());
 
   // And the proper child remains.
   EXPECT_EQ(WebAccessibility::ROLE_TEXT_FIELD, acc1_2->role());
   EXPECT_EQ(1001, acc1_2->renderer_id());
 
-  // Tree with a child button.
-  WebAccessibility tree2_1;
-  tree2_1.id = 1000;
-  tree2_1.role = WebAccessibility::ROLE_WEB_AREA;
-
-  WebAccessibility tree2_2;
-  tree2_2.id = 1001;
-  tree2_2.role = WebAccessibility::ROLE_BUTTON;
-
-  tree2_1.children.push_back(tree2_2);
-
-  msg->acc_obj = tree2_1;
-
-  // Fire another load complete.
-  manager->OnAccessibilityNotifications(params);
-
-  BrowserAccessibility* acc2_2 = manager->GetFromRendererID(1001);
-
-  // Verify the root has not changed.
-  EXPECT_EQ(root, manager->GetRoot());
-
-  // And the proper child remains.
-  EXPECT_EQ(WebAccessibility::ROLE_BUTTON, acc2_2->role());
-  EXPECT_EQ(1001, acc2_2->renderer_id());
-
-  // Verify we don't reuse objects that have changed roles.

[David Tseng, 2011/08/16 23:32:52]

Shouldn't this be the only assertion removed from this test?

[Chris Guillory, 2011/08/17 00:00:43]

Done. I've also updated tree2 to not attempt to change the role of an
accessibility object.

-  EXPECT_NE(acc1_2, acc2_2);
-
   // Ensure we properly cleaned up.
   manager.reset();
   ASSERT_EQ(0, CountedBrowserAccessibility::global_obj_count_);
 }