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

chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

 // Copyright 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/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 781 matching lines @@
     CommandLine::ForCurrentProcess()->AppendSwitch(switches::kMultiProfiles);
 
     // Initialize the UserManager singleton to a fresh FakeUserManager instance.
     user_manager_enabler_.reset(
         new chromeos::ScopedUserManagerEnabler(new chromeos::FakeUserManager));
 
     // Initialize the rest.
     ChromeLauncherControllerTest::SetUp();
 
     // Get some base objects.
-    session_delegate_ = static_cast<ash::test::TestSessionStateDelegate*>(
-        ash::Shell::GetInstance()->session_state_delegate());
-    session_delegate_->set_logged_in_users(2);
+    session_delegate()->set_logged_in_users(2);
     shell_delegate_ = static_cast<ash::test::TestShellDelegate*>(
         ash::Shell::GetInstance()->delegate());
     shell_delegate_->set_multi_profiles_enabled(true);
   }
 
   virtual void TearDown() {
     ChromeLauncherControllerTest::TearDown();
     user_manager_enabler_.reset();
     for (ProfileToNameMap::iterator it = created_profiles_.begin();
          it != created_profiles_.end(); ++it)
       profile_manager_->DeleteTestingProfile(it->second);
 
     // A Task is leaked if we don't destroy everything, then run the message
     // loop.
     base::MessageLoop::current()->PostTask(FROM_HERE,
                                            base::MessageLoop::QuitClosure());
     base::MessageLoop::current()->Run();
   }
 
   // Creates a profile for a given |user_name|. Note that this class will keep
   // the ownership of the created object.
   TestingProfile* CreateMultiUserProfile(const std::string& user_name) {
     std::string email_string = user_name + "@example.com";
-
+    static_cast<ash::test::TestSessionStateDelegate*>(
+        ash::Shell::GetInstance()->session_state_delegate())
+        ->AddUser(email_string);
     // Add a user to the fake user manager.
+    session_delegate()->AddUser(email_string);
     GetFakeUserManager()->AddUser(email_string);
 
     GetFakeUserManager()->UserLoggedIn(
         email_string,
         email_string + kUserIdHashSuffix,
         false);
 
     std::string profile_name =
         chrome::kProfileDirPrefix + email_string + kUserIdHashSuffix;
     TestingProfile* profile = profile_manager()->CreateTestingProfile(
@@ skipping 57 matching lines @@
     app_tab_helper->SetAppID(
         v1_app->browser()->tab_strip_model()->GetWebContentsAt(0),
         app_name);
     SetAppTabHelper(app_tab_helper);
 
     NavigateAndCommitActiveTabWithTitle(
         v1_app->browser(), GURL(url), ASCIIToUTF16(""));
     return v1_app;
   }
 
-  ash::test::TestSessionStateDelegate*
-      session_delegate() { return session_delegate_; }
+  ash::test::TestSessionStateDelegate* session_delegate() {
+    return static_cast<ash::test::TestSessionStateDelegate*>(
+        ash::Shell::GetInstance()->session_state_delegate());
+  }
   ash::test::TestShellDelegate* shell_delegate() { return shell_delegate_; }
 
   // Override BrowserWithTestWindowTest:
   virtual TestingProfile* CreateProfile() OVERRIDE {
     return CreateMultiUserProfile("user1");
   }
   virtual void DestroyProfile(TestingProfile* profile) OVERRIDE {
     // Delete the profile through our profile manager.
     ProfileToNameMap::iterator it = created_profiles_.find(profile);
     DCHECK(it != created_profiles_.end());
@@ skipping 10 matching lines @@
   TestingProfileManager* profile_manager() { return profile_manager_.get(); }
 
   chromeos::FakeUserManager* GetFakeUserManager() {
     return static_cast<chromeos::FakeUserManager*>(
         chromeos::UserManager::Get());
   }
 
   scoped_ptr<TestingProfileManager> profile_manager_;
   scoped_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
 
-  ash::test::TestSessionStateDelegate* session_delegate_;
   ash::test::TestShellDelegate* shell_delegate_;
 
   ProfileToNameMap created_profiles_;
 
   DISALLOW_COPY_AND_ASSIGN(
       MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest);
 };
 #endif  // defined(OS_CHROMEOS)
 
 
@@ skipping 1747 matching lines @@
 
   EXPECT_EQ(1, app_icon_loader->fetch_count());
   ASSERT_EQ(initial_size + 1, model_->items().size());
   EXPECT_TRUE(launcher_controller_->IsAppPinned("1"));
   EXPECT_FALSE(launcher_controller_->IsAppPinned("0"));
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type);
 
   launcher_controller_->UnpinAppWithID("1");
   ASSERT_EQ(initial_size, model_->items().size());
 }