Fixes crash in BrowserAccessibilityManager destructor (see CPBrowsingContextManager for example of this type of fix).

Also fixes small style issue, to be consistent with other Singleton implementations.

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

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

1 files changed, 6 insertions, 5 deletions

diff --git a/chrome/browser/browser_accessibility.cc b/chrome/browser/browser_accessibility.cc
index bb6b8d2..fea5bf2 100644
--- a/chrome/browser/browser_accessibility.cc
+++ b/chrome/browser/browser_accessibility.cc
@@ -533,23 +533,24 @@ STDMETHODIMP BrowserAccessibility::put_accValue(VARIANT var_id, BSTR put_val) {
 STDMETHODIMP BrowserAccessibility::CreateInstance(REFIID iid,
                                                   int iaccessible_id,
                                                   void** interface_ptr) {
-  return BrowserAccessibilityManager::Instance()->CreateAccessibilityInstance(
-      iid, iaccessible_id, instance_id(), interface_ptr);
+  return BrowserAccessibilityManager::GetInstance()->
+      CreateAccessibilityInstance(iid, iaccessible_id, instance_id(),
+                                  interface_ptr);
 }
 
 bool BrowserAccessibility::RequestAccessibilityInfo(int iaccessible_func_id,
                                                     VARIANT var_id, LONG input1,
                                                     LONG input2) {
-  return BrowserAccessibilityManager::Instance()->RequestAccessibilityInfo(
+  return BrowserAccessibilityManager::GetInstance()->RequestAccessibilityInfo(
       iaccessible_id(), instance_id(), iaccessible_func_id, var_id, input1,
       input2);
 }
 
 ViewHostMsg_Accessibility_Out_Params BrowserAccessibility::response() {
-  return BrowserAccessibilityManager::Instance()->response();
+  return BrowserAccessibilityManager::GetInstance()->response();
 }
 
 HWND BrowserAccessibility::parent_hwnd() {
-  return BrowserAccessibilityManager::Instance()->parent_hwnd(instance_id());
+  return BrowserAccessibilityManager::GetInstance()->parent_hwnd(instance_id());
 }