Remove USE_ATHENA ifdefs from chrome/browser/chromeos/accessibility

chrome/browser/chromeos/accessibility/accessibility_manager.h

Index: chrome/browser/chromeos/accessibility/accessibility_manager.h
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.h b/chrome/browser/chromeos/accessibility/accessibility_manager.h
index 4a216d32d2260390871877f1972d3fb5a60eb0c8..fb8a11e61bc828413b8fce79a9b33b20d6a8bbec 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.h
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.h
@@ -7,6 +7,7 @@
 
 #include <set>
 
+#include "ash/session/session_state_observer.h"
 #include "base/callback_forward.h"
 #include "base/callback_list.h"
 #include "base/memory/weak_ptr.h"
@@ -22,10 +23,6 @@
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/chromeos/accessibility_types.h"
 
-#if !defined(USE_ATHENA)
-#include "ash/session/session_state_observer.h"
-#endif
-
 namespace content {
 class RenderViewHost;
 }
@@ -76,9 +73,7 @@ typedef AccessibilityStatusCallbackList::Subscription
 class AccessibilityManager
     : public content::NotificationObserver,
       public extensions::api::braille_display_private::BrailleObserver,
-#if !defined(USE_ATHENA)
       public ash::SessionStateObserver,
-#endif
       public input_method::InputMethodManager::Observer {
  public:
   // Creates an instance of AccessibilityManager, this should be called once,
@@ -166,10 +161,8 @@ class AccessibilityManager
   // false.
   bool IsBrailleDisplayConnected() const;
 
-#if !defined(USE_ATHENA)
   // SessionStateObserver overrides:
   virtual void ActiveUserChanged(const std::string& user_id) override;
-#endif
 
   void SetProfileForTest(Profile* profile);
 
@@ -261,9 +254,7 @@ class AccessibilityManager
   content::NotificationRegistrar notification_registrar_;
   scoped_ptr<PrefChangeRegistrar> pref_change_registrar_;
   scoped_ptr<PrefChangeRegistrar> local_state_pref_change_registrar_;
-#if !defined(USE_ATHENA)
   scoped_ptr<ash::ScopedSessionStateObserver> session_state_observer_;
-#endif
 
   PrefHandler large_cursor_pref_handler_;
   PrefHandler spoken_feedback_pref_handler_;