2 files changed, 5 insertions, 7 deletions
diff --git a/content/browser/accessibility/browser_accessibility_state_impl.cc b/content/browser/accessibility/browser_accessibility_state_impl.cc
index 7edc3e0..f3b8aaf 100644
--- a/content/browser/accessibility/browser_accessibility_state_impl.cc
+++ b/content/browser/accessibility/browser_accessibility_state_impl.cc
@@ -19,7 +19,8 @@ BrowserAccessibilityState* BrowserAccessibilityState::GetInstance() {
 
 // static
 BrowserAccessibilityStateImpl* BrowserAccessibilityStateImpl::GetInstance() {
-  return Singleton<BrowserAccessibilityStateImpl>::get();
+  return Singleton<BrowserAccessibilityStateImpl,
+                   LeakySingletonTraits<BrowserAccessibilityStateImpl> >::get();
 }
 
 BrowserAccessibilityStateImpl::BrowserAccessibilityStateImpl()
diff --git a/content/browser/accessibility/browser_accessibility_state_impl.h b/content/browser/accessibility/browser_accessibility_state_impl.h
index 732da03..6d67f95 100644
--- a/content/browser/accessibility/browser_accessibility_state_impl.h
+++ b/content/browser/accessibility/browser_accessibility_state_impl.h
@@ -11,8 +11,6 @@
 #include "base/timer.h"
 #include "content/public/browser/browser_accessibility_state.h"
 
-template <typename T> struct DefaultSingletonTraits;
-
 // The BrowserAccessibilityState class is used to determine if Chrome should be
 // customized for users with assistive technology, such as screen readers. We
 // modify the behavior of certain user interfaces to provide a better experience
@@ -33,6 +31,9 @@ template <typename T> struct DefaultSingletonTraits;
 class CONTENT_EXPORT BrowserAccessibilityStateImpl
     : public BrowserAccessibilityState {
  public:
+  BrowserAccessibilityStateImpl();
+
+  // Leaky singleton, destructor generally won't be called.
   virtual ~BrowserAccessibilityStateImpl();
 
   static BrowserAccessibilityStateImpl* GetInstance();
@@ -46,10 +47,6 @@ class CONTENT_EXPORT BrowserAccessibilityStateImpl
   void UpdateHistogram();
 
  protected:
-  BrowserAccessibilityStateImpl();
-
-  friend struct DefaultSingletonTraits<BrowserAccessibilityStateImpl>;
-
   // Set to true when full accessibility features should be enabled.
   bool accessibility_enabled_;