Fix BrowserAccessibilityManager valgrind errors.

BUG=91845,92396,59243
TEST=*_valgrind try bots green.


Review URL: http://codereview.chromium.org/7639019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96741 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/accessibility/browser_accessibility_manager_unittest.cc

@@ -554,12 +554,12 @@ TEST(BrowserAccessibilityManagerTest, TestMoveChildUp) {
 
 TEST(BrowserAccessibilityManagerTest, TestCreateEmptyDocument) {
   // Try creating an empty document with busy state.
-  BrowserAccessibilityManager* manager =
-      BrowserAccessibilityManager::CreateEmptyDocument(
-          NULL,
-          WebAccessibility::STATE_BUSY,
-          NULL,
-          new CountedBrowserAccessibilityFactory());
+  scoped_ptr<BrowserAccessibilityManager> manager;
+  manager.reset(BrowserAccessibilityManager::CreateEmptyDocument(
+      NULL,
+      WebAccessibility::STATE_BUSY,
+      NULL,
+      new CountedBrowserAccessibilityFactory()));
 
   // Verify the root is as we expect by default.
   BrowserAccessibility* root = manager->GetRoot();
@@ -625,4 +625,8 @@ TEST(BrowserAccessibilityManagerTest, TestCreateEmptyDocument) {
 
   // Verify we don't reuse objects that have changed roles.
   EXPECT_NE(acc1_2, acc2_2);
+
+  // Ensure we properly cleaned up.
+  manager.reset();
+  ASSERT_EQ(0, CountedBrowserAccessibility::global_obj_count_);
 }

tools/valgrind/memcheck/suppressions.txt

@@ -5140,43 +5140,6 @@
    fun:_ZN12sync_ui_util25ConstructAboutInformationEP18ProfileSyncServicePN4base15DictionaryValueE
    fun:_ZN71SyncUIUtilTest_ConstructAboutInformationWithUnrecoverableErrorTest_Test8TestBodyEv
 }
-{
-   bug_91845_a
-   Memcheck:Leak
-   fun:_Znw*
-   ...
-   fun:_ZN27BrowserAccessibilityManager23CreateAccessibilityTreeEP20BrowserAccessibilityRKN11webkit_glue16WebAccessibilityEi
-   ...
-   fun:_ZN60BrowserAccessibilityManagerTest_TestCreateEmptyDocument_Test8TestBodyEv
-}
-{
-   bug_91845_b
-   Memcheck:Leak
-   fun:_Znw*
-   fun:_ZN27BrowserAccessibilityManager6CreateEP10_GtkWidgetRKN11webkit_glue16WebAccessibilityEP28BrowserAccessibilityDelegateP27BrowserAccessibilityFactory
-   fun:_ZN27BrowserAccessibilityManager19CreateEmptyDocumentEP10_GtkWidgetN11webkit_glue16WebAccessibility5StateEP28BrowserAccessibilityDelegateP27BrowserAccessibilityFactory
-   fun:_ZN60BrowserAccessibilityManagerTest_TestCreateEmptyDocument_Test8TestBodyEv
-}
-{
-   bug_91845_c
-   Memcheck:Leak
-   fun:_Znw*
-   fun:_ZN9__gnu_cxx13new_allocatorIPNS_15_Hashtable_nodeISt4pairIKiP20BrowserAccessibilityEEEE8allocateEmPKv
-   fun:_ZNSt12_Vector_baseIPN9__gnu_cxx15_Hashtable_nodeISt4pairIKiP20BrowserAccessibilityEEESaIS8_EE11_M_allocateEm
-   fun:_ZNSt6vectorIPN9__gnu_cxx15_Hashtable_nodeISt4pairIKiP20BrowserAccessibilityEEESaIS8_EE20_M_allocate_and_copyIPS8_EESC_mT_SD_
-   fun:_ZNSt6vectorIPN9__gnu_cxx15_Hashtable_nodeISt4pairIKiP20BrowserAccessibilityEEESaIS8_EE7reserveEm
-   fun:_ZN9__gnu_cxx9hashtableISt4pairIKiP20BrowserAccessibilityEiNS_4hashIiEESt10_Select1stIS5_ESt8equal_toIiESaIS4_EE21_M_initialize_bucketsEm
-   fun:_ZN9__gnu_cxx9hashtableISt4pairIKiP20BrowserAccessibilityEiNS_4hashIiEESt10_Select1stIS5_ESt8equal_toIiESaIS4_EEC2EmRKS7_RKSB_RKSaIS5_E
-   fun:_ZN9__gnu_cxx9hashtableISt4pairIKiP20BrowserAccessibilityEiNS_4hashIiEESt10_Select1stIS5_ESt8equal_toIiESaIS4_EEC1EmRKS7_RKSB_RKSaIS5_E
-   fun:_ZN9__gnu_cxx8hash_mapIiP20BrowserAccessibilityNS_4hashIiEESt8equal_toIiESaIS2_EEC2Ev
-   fun:_ZN9__gnu_cxx8hash_mapIiP20BrowserAccessibilityNS_4hashIiEESt8equal_toIiESaIS2_EEC1Ev
-   fun:_ZN27BrowserAccessibilityManagerC2EP6NSViewRKN11webkit_glue16WebAccessibilityEP28BrowserAccessibilityDelegateP27BrowserAccessibilityFactory
-   fun:_ZN30BrowserAccessibilityManagerMacC2EP6NSViewRKN11webkit_glue16WebAccessibilityEP28BrowserAccessibilityDelegateP27BrowserAccessibilityFactory
-   fun:_ZN30BrowserAccessibilityManagerMacC1EP6NSViewRKN11webkit_glue16WebAccessibilityEP28BrowserAccessibilityDelegateP27BrowserAccessibilityFactory
-   fun:_ZN27BrowserAccessibilityManager6CreateEP6NSViewRKN11webkit_glue16WebAccessibilityEP28BrowserAccessibilityDelegateP27BrowserAccessibilityFactory
-   fun:_ZN27BrowserAccessibilityManager19CreateEmptyDocumentEP6NSViewN11webkit_glue16WebAccessibility5StateEP28BrowserAccessibilityDelegateP27BrowserAccessibilityFactory
-   fun:_ZN60BrowserAccessibilityManagerTest_TestCreateEmptyDocument_Test8TestBodyEv
-}
 {
    bug_92123
    Memcheck:Leak
@@ -5231,16 +5194,6 @@
    fun:_ZN27ScopedRunnableMethodFactoryIN3net21HttpStreamFactoryImpl3JobEE14RunnableMethodIMS2_FvvE6Tuple0E3RunEv
    fun:_ZN4base6subtle18TaskClosureAdapter3RunEv
 }
-{
-   bug_92396
-   Memcheck:Leak
-   fun:_Znw*
-   fun:_ZN27BrowserAccessibilityManager6CreateEP6NSViewRKN11webkit_glue16WebAccessibilityEP28BrowserAccessibilityDelegateP27BrowserAccessibilityFactory
-   fun:_ZN27BrowserAccessibilityManager19CreateEmptyDocumentEP6NSViewN11webkit_glue16WebAccessibility5StateEP28BrowserAccessibilityDelegateP27BrowserAccessibilityFactory
-   fun:_ZN60BrowserAccessibilityManagerTest_TestCreateEmptyDocument_Test8TestBodyEv
-   fun:_ZN7testing8internal38HandleSehExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS4_FS3_vEPKc
-   fun:_ZN7testing8internal35HandleExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS4_FS3_vEPKc
-}
 {
    bug_92548
    Memcheck:Leak

tools/valgrind/memcheck/suppressions_mac.txt

@@ -1030,22 +1030,6 @@
    fun:_ZN6webkit5npapi10PluginList10GetPluginsEbPSt6vectorI13WebPluginInfoSaIS2_EE
    fun:_ZN13PluginUpdater30GetPreferencesDataOnFileThreadEPv
 }
-{
-   bug_59243_a
-   Memcheck:Leak
-   fun:_Znw*
-   fun:_ZN20BrowserAccessibility6CreateEv
-   fun:_ZN24BrowserAccessibilityTest5SetUpEv
-}
-{
-   bug_59243_b
-   Memcheck:Leak
-   fun:_Znw*
-   ...
-   fun:_ZNSt3mapIiSbItN4base20string16_char_traitsESaItEESt4lessIiESaISt4pairIKiS3_EEEaSERKSA_
-   fun:_ZN20BrowserAccessibility10InitializeEP27BrowserAccessibilityManagerPS_iiRKN11webkit_glue16WebAccessibilityE
-   fun:_ZN24BrowserAccessibilityTest5SetUpEv
-}
 {
    bug_51682a
    Memcheck:Leak