cros: Fix user image change crash

chrome/browser/ui/webui/settings/profile_info_handler.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/webui/settings/profile_info_handler.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 23 matching lines @@
 const char ProfileInfoHandler::kProfileInfoChangedEventName[] =
     "profile-info-changed";
 const char
     ProfileInfoHandler::kProfileManagesSupervisedUsersChangedEventName[] =
         "profile-manages-supervised-users-changed";
 const char ProfileInfoHandler::kProfileStatsCountReadyEventName[] =
     "profile-stats-count-ready";
 
 ProfileInfoHandler::ProfileInfoHandler(Profile* profile)
     : profile_(profile),
+#if defined(OS_CHROMEOS)
+      user_manager_observer_(this),
+#endif
       profile_observer_(this) {
 #if defined(OS_CHROMEOS)
   // Set up the chrome://userimage/ source.
   content::URLDataSource::Add(profile,
                               new chromeos::options::UserImageSource());
 #endif
 }
 
 ProfileInfoHandler::~ProfileInfoHandler() {}
 
@@ skipping 18 matching lines @@
       &g_browser_process->profile_manager()->GetProfileAttributesStorage());
 
   PrefService* prefs = profile_->GetPrefs();
   profile_pref_registrar_.Init(prefs);
   profile_pref_registrar_.Add(
       prefs::kSupervisedUsers,
       base::Bind(&ProfileInfoHandler::PushProfileManagesSupervisedUsersStatus,
                  base::Unretained(this)));
 
 #if defined(OS_CHROMEOS)
-  user_manager::UserManager::Get()->AddObserver(this);
+  user_manager_observer_.Add(user_manager::UserManager::Get());
 #endif
 }
 
 void ProfileInfoHandler::OnJavascriptDisallowed() {
   profile_observer_.Remove(
       &g_browser_process->profile_manager()->GetProfileAttributesStorage());
 
   profile_pref_registrar_.RemoveAll();
 
 #if defined(OS_CHROMEOS)
-  user_manager::UserManager::Get()->RemoveObserver(this);
+  user_manager_observer_.Remove(user_manager::UserManager::Get());
 #endif
 }
 
 #if defined(OS_CHROMEOS)
 void ProfileInfoHandler::OnUserImageChanged(const user_manager::User& user) {
   PushProfileInfo();
 }
 #endif
 
 void ProfileInfoHandler::OnProfileNameChanged(
@@ skipping 115 matching lines @@
   response->SetString("name", name);
   response->SetString("iconUrl", icon_url);
   return base::WrapUnique(response);
 }
 
 bool ProfileInfoHandler::IsProfileManagingSupervisedUsers() const {
   return !profile_->GetPrefs()->GetDictionary(prefs::kSupervisedUsers)->empty();
 }
 
 }  // namespace settings