Fix race in BrowserAccessibilityManagerWin creation.

content/browser/accessibility/browser_accessibility_manager_win.h

Index: content/browser/accessibility/browser_accessibility_manager_win.h
diff --git a/content/browser/accessibility/browser_accessibility_manager_win.h b/content/browser/accessibility/browser_accessibility_manager_win.h
index 18260e4f70d158a84da04cfa552fa46896ee2291..a79305899b08e632f3c5d1a0c7b11ccb9e5d630f 100644
--- a/content/browser/accessibility/browser_accessibility_manager_win.h
+++ b/content/browser/accessibility/browser_accessibility_manager_win.h
@@ -21,8 +21,6 @@ class CONTENT_EXPORT BrowserAccessibilityManagerWin
     : public BrowserAccessibilityManager {
  public:
   BrowserAccessibilityManagerWin(
-      content::LegacyRenderWidgetHostHWND* accessible_hwnd,
-      IAccessible* parent_iaccessible,
       const ui::AXTreeUpdate& initial_tree,
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory = new BrowserAccessibilityFactory());
@@ -31,15 +29,6 @@ class CONTENT_EXPORT BrowserAccessibilityManagerWin
 
   static ui::AXTreeUpdate GetEmptyDocument();
 
-  // Get the closest containing HWND.
-  HWND parent_hwnd() { return parent_hwnd_; }
-
-  // The IAccessible for the parent window.
-  IAccessible* parent_iaccessible() { return parent_iaccessible_; }
-  void set_parent_iaccessible(IAccessible* parent_iaccessible) {
-    parent_iaccessible_ = parent_iaccessible;
-  }
-
   // Calls NotifyWinEvent if the parent window's IAccessible pointer is known.
   void MaybeCallNotifyWinEvent(DWORD event, LONG child_id);
 
@@ -62,20 +51,11 @@ class CONTENT_EXPORT BrowserAccessibilityManagerWin
   // unique id, does not make a new reference.
   BrowserAccessibilityWin* GetFromUniqueIdWin(LONG unique_id_win);
 
-  // Called when |accessible_hwnd_| is deleted by its parent.
-  void OnAccessibleHwndDeleted();
-
  protected:
   // BrowserAccessibilityManager methods
   virtual void OnRootChanged(ui::AXNode* new_root) OVERRIDE;
 
  private:
-  // The closest ancestor HWND.
-  HWND parent_hwnd_;
-
-  // The accessibility instance for the parent window.
-  IAccessible* parent_iaccessible_;
-
   // Give BrowserAccessibilityManager::Create access to our constructor.
   friend class BrowserAccessibilityManager;
 
@@ -88,9 +68,6 @@ class CONTENT_EXPORT BrowserAccessibilityManagerWin
   // browser process) to accessibility ids within this page.
   base::hash_map<long, int32> unique_id_to_ax_id_map_;
 
-  // Owned by its parent; OnAccessibleHwndDeleted gets called upon deletion.
-  LegacyRenderWidgetHostHWND* accessible_hwnd_;
-
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManagerWin);
 };