CleanUp: Introduce UserInfo. Move session_state stuff to ash/session.

chrome/browser/notifications/message_center_settings_controller.cc

 // Copyright (c) 2013 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/notifications/message_center_settings_controller.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/string_compare.h"
@@ skipping 457 matching lines @@
     return;
 
   chromeos::UserManager* user_manager = chromeos::UserManager::Get();
   // |notifier_groups_| can be empty in login screen too.
   if (!user_manager->IsLoggedInAsGuest())
     return;
 
   chromeos::User* user = user_manager->GetActiveUser();
   Profile* profile = user_manager->GetProfileByUser(user);
   DCHECK(profile);
-  notifier_groups_.push_back(new message_center::ProfileNotifierGroup(
-      gfx::Image(user->image()),
-      user->GetDisplayName(),
-      user->GetDisplayName(),
-      0,
-      profile));
+  notifier_groups_.push_back(
+      new message_center::ProfileNotifierGroup(gfx::Image(user->GetImage()),
+                                               user->GetDisplayName(),
+                                               user->GetDisplayName(),
+                                               0,
+                                               profile));
 
   FOR_EACH_OBSERVER(message_center::NotifierSettingsObserver,
                     observers_,
                     NotifierGroupChanged());
 }
 #endif
 
 void MessageCenterSettingsController::RebuildNotifierGroups() {
   notifier_groups_.clear();
   current_notifier_group_ = 0;
@@ skipping 44 matching lines @@
     // creating a primary profile, and causes an infinite loop.
     // Thus, it would be better to delay creating group for guest login.
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE,
         base::Bind(
             &MessageCenterSettingsController::CreateNotifierGroupForGuestLogin,
             weak_factory_.GetWeakPtr()));
   }
 #endif
 }