cros: Clean up SessionStateDelegate refs in Chrome

chrome/browser/ui/ash/palette_delegate_chromeos.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/palette_delegate_chromeos.h"
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
 #include "ash/common/system/chromeos/palette/palette_utils.h"
 #include "ash/screenshot_delegate.h"
 #include "ash/shell.h"
@@ skipping 38 matching lines @@
                                                          base::FilePath());
 }
 
 bool PaletteDelegateChromeOS::HasNoteApp() {
   if (!profile_)
     return false;
 
   return chromeos::NoteTakingHelper::Get()->IsAppAvailable(profile_);
 }
 
-void PaletteDelegateChromeOS::ActiveUserChanged(const AccountId& account_id) {
-  const user_manager::User* user =
-      user_manager::UserManager::Get()->FindUser(account_id);
-  Profile* profile = ProfileHelper::Get()->GetProfileByUser(user);
-  SetProfile(profile);
+void PaletteDelegateChromeOS::ActiveUserChanged(
+    const user_manager::User* active_user) {
+  SetProfile(ProfileHelper::Get()->GetProfileByUser(active_user));
 }
 
 void PaletteDelegateChromeOS::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_SESSION_STARTED:
       // Update |profile_| when entering a session.
       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.
       Profile* profile = content::Source<Profile>(source).ptr();
       if (profile_ == profile)
         SetProfile(nullptr);
       break;
     }
   }
@@ skipping 64 matching lines @@
   screenshot_controller->set_on_screenshot_session_done(
       base::Bind(&PaletteDelegateChromeOS::OnPartialScreenshotDone,
                  weak_factory_.GetWeakPtr(), done));
 }
 
 void PaletteDelegateChromeOS::CancelPartialScreenshot() {
   ash::Shell::GetInstance()->screenshot_controller()->CancelScreenshotSession();
 }
 
 }  // namespace chromeos