Fixes crash in BrowserAccessibilityManager destructor.

chrome/browser/browser_accessibility_manager.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_BROWSER_BROWSER_ACCESSIBILITY_MANAGER_H_
 #define CHROME_BROWSER_BROWSER_ACCESSIBILITY_MANAGER_H_
 
 #include <oaidl.h>  // Needed for VARIANT structure.
 #include <hash_map>
 
@@ skipping 29 matching lines @@
 // ensure that a termination of a renderer process gets propagated to the
 // active BrowserAccessibility instances calling into it. Each such instance
 // will upon such an event be set to an inactive state, failing calls from the
 // assistive technology gracefully.
 ////////////////////////////////////////////////////////////////////////////////
 class BrowserAccessibilityManager : public NotificationObserver {
  public:
   // Gets the singleton BrowserAccessibilityManager object. The first time this
   // method is called, a CacheManagerHost object is constructed and returned.
   // Subsequent calls will return the same object.
-  static BrowserAccessibilityManager* Instance();
+  static BrowserAccessibilityManager* GetInstance();
 
   // Creates an instance of BrowserAccessibility, initializes it and sets the
   // iaccessible_id and parent_id.
   STDMETHODIMP CreateAccessibilityInstance(REFIID iid,
                                            int iaccessible_id,
                                            int instance_id,
                                            void** interface_ptr);
 
   // Composes and sends a message for requesting needed accessibility
   // information. Unused LONG input parameters should be NULL, and the VARIANT
@@ skipping 18 matching lines @@
                   RenderWidgetHost* render_widget_host);
 
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
  protected:
   // This class is a singleton.  Do not instantiate directly.
   BrowserAccessibilityManager();
-  friend DefaultSingletonTraits<BrowserAccessibilityManager>;
+  friend struct DefaultSingletonTraits<BrowserAccessibilityManager>;
 
   ~BrowserAccessibilityManager();
 
  private:
   // Caching of the unique member variables used to handle browser accessibility
   // requests from multiple processes.
   InstanceMap instance_map_;
   int instance_id_;
 
   // Reverse mapping to track which RenderProcessHosts are active. If a
   // RenderProcessHost is found to be terminated, it should be removed from this
   // mapping, and the connected BrowserAccessibility ids/instances invalidated.
   RenderProcessHostMap render_process_host_map_;
 
   ViewHostMsg_Accessibility_Out_Params out_params_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManager);
 };
 #endif  // CHROME_BROWSER_BROWSER_ACCESSIBILITY_MANAGER_H_