cros: Clean up SessionStateDelegate refs in Chrome

chrome/browser/chromeos/accessibility/accessibility_manager.cc

Index: chrome/browser/chromeos/accessibility/accessibility_manager.cc
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
index 6cc9829594b5030fdf612322a72355a6ccc28261..ca8c82186a7ea12a56b8deb66581406c72ac6b62 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -13,7 +13,6 @@
 #include "ash/autoclick/autoclick_controller.h"
 #include "ash/autoclick/mus/public/interfaces/autoclick.mojom.h"
 #include "ash/common/ash_constants.h"
-#include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm_shell.h"
@@ -58,10 +57,8 @@
 #include "chrome/grit/browser_resources.h"
 #include "chromeos/audio/audio_a11y_controller.h"
 #include "chromeos/audio/chromeos_sounds.h"
-#include "chromeos/login/login_state.h"
 #include "components/prefs/pref_member.h"
 #include "components/prefs/pref_service.h"
-#include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
@@ -333,6 +330,8 @@ AccessibilityManager::~AccessibilityManager() {
     chromevox_panel_->Close();
     chromevox_panel_ = nullptr;
   }
+
+  session_state_observer_.reset();

[James Cook, 2017/02/27 21:20:28]

nit: document why this has to be done here

[xiyuan, 2017/02/27 22:16:21]

I removed OnAppTerminating and moved its code here. But think again, we probably
don't need to explicitly do this. So removed the code. 

 }
 
 bool AccessibilityManager::ShouldShowAccessibilityMenu() {
@@ -1152,14 +1151,11 @@ void AccessibilityManager::SetProfile(Profile* profile) {
     chromevox_panel_->UpdatePanelHeight();
 }
 
-void AccessibilityManager::ActiveUserChanged(const AccountId& account_id) {
+void AccessibilityManager::ActiveUserChanged(
+    const user_manager::User* active_user) {
   SetProfile(ProfileManager::GetActiveUserProfile());
 }
 
-void AccessibilityManager::OnAppTerminating() {
-  session_state_observer_.reset();
-}
-
 void AccessibilityManager::OnFullscreenStateChanged(
     bool is_fullscreen,
     ash::WmWindow* root_window) {
@@ -1268,9 +1264,9 @@ void AccessibilityManager::Observe(
       SetProfile(ProfileManager::GetActiveUserProfile());
 
       // Add a session state observer to be able to monitor session changes.
-      if (!session_state_observer_.get() && ash::Shell::HasInstance())
+      if (!session_state_observer_.get())
         session_state_observer_.reset(
-            new ash::ScopedSessionStateObserver(this));
+            new user_manager::ScopedUserSessionStateObserver(this));
       break;
     case chrome::NOTIFICATION_PROFILE_DESTROYED: {
       // Update |profile_| when exiting a session or shutting down.