Move User Manager onto a System profile.

chrome/browser/app_controller_mac_browsertest.mm

 // Copyright (c) 2012 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.
 
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 #import <Foundation/Foundation.h>
 #import <Foundation/NSAppleEventDescriptor.h>
 #import <objc/message.h>
 #import <objc/runtime.h>
@@ skipping 184 matching lines @@
                            Profile::CreateStatus status) {
   EXPECT_TRUE(profile);
   EXPECT_NE(Profile::CREATE_STATUS_LOCAL_FAIL, status);
   EXPECT_NE(Profile::CREATE_STATUS_REMOTE_FAIL, status);
   // This will be called multiple times. Wait until the profile is initialized
   // fully to quit the loop.
   if (status == Profile::CREATE_STATUS_INITIALIZED)
     quit_closure.Run();
 }
 
-void CreateAndWaitForGuestProfile() {
+void CreateAndWaitForSystemProfile() {
   ProfileManager::CreateCallback create_callback =
       base::Bind(&CreateProfileCallback,
                  base::MessageLoop::current()->QuitClosure());
   g_browser_process->profile_manager()->CreateProfileAsync(
-      ProfileManager::GetGuestProfilePath(),
+      ProfileManager::GetSystemProfilePath(),
       create_callback,
       base::string16(),
       base::string16(),
       std::string());
   base::RunLoop().Run();
 }
 
 class AppControllerNewProfileManagementBrowserTest
     : public InProcessBrowserTest {
  protected:
@@ skipping 17 matching lines @@
   BOOL result = [ac applicationShouldHandleReopen:NSApp hasVisibleWindows:NO];
 
   EXPECT_FALSE(result);
   EXPECT_EQ(2u, active_browser_list_->size());
   EXPECT_FALSE(UserManager::IsShowing());
 }
 
 // Test that for a locked last profile, a reopen event opens the User Manager.
 IN_PROC_BROWSER_TEST_F(AppControllerNewProfileManagementBrowserTest,
                        LockedProfileReopenWithNoWindows) {
-  // The User Manager uses the guest profile as its underlying profile. To
+  // The User Manager uses the system profile as its underlying profile. To
   // minimize flakiness due to the scheduling/descheduling of tasks on the
   // different threads, pre-initialize the guest profile before it is needed.
-  CreateAndWaitForGuestProfile();
+  CreateAndWaitForSystemProfile();
   base::scoped_nsobject<AppController> ac([[AppController alloc] init]);
 
   // Lock the active profile.
   Profile* profile = [ac lastProfile];
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   size_t profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
   cache.SetProfileSigninRequiredAtIndex(profile_index, true);
   EXPECT_TRUE(cache.ProfileIsSigninRequiredAtIndex(profile_index));
 
   EXPECT_EQ(1u, active_browser_list_->size());
   BOOL result = [ac applicationShouldHandleReopen:NSApp hasVisibleWindows:NO];
   EXPECT_FALSE(result);
 
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1u, active_browser_list_->size());
   EXPECT_TRUE(UserManager::IsShowing());
   UserManager::Hide();
 }
 
 // Test that for a guest last profile, a reopen event opens the User Manager.
 IN_PROC_BROWSER_TEST_F(AppControllerNewProfileManagementBrowserTest,
                        GuestProfileReopenWithNoWindows) {
-  // Create the guest profile, and set it as the last used profile so the
+  // Create the system profile. Set the guest as the last used profile so the
   // app controller can use it on init.
-  CreateAndWaitForGuestProfile();
+  CreateAndWaitForSystemProfile();
   PrefService* local_state = g_browser_process->local_state();
   local_state->SetString(prefs::kProfileLastUsed, chrome::kGuestProfileDir);
 
   base::scoped_nsobject<AppController> ac([[AppController alloc] init]);
 
   Profile* profile = [ac lastProfile];
   EXPECT_EQ(ProfileManager::GetGuestProfilePath(), profile->GetPath());
   EXPECT_TRUE(profile->IsGuestSession());
 
   EXPECT_EQ(1u, active_browser_list_->size());
   BOOL result = [ac applicationShouldHandleReopen:NSApp hasVisibleWindows:NO];
   EXPECT_FALSE(result);
 
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(1u, active_browser_list_->size());
   EXPECT_TRUE(UserManager::IsShowing());
   UserManager::Hide();
 }
 
 IN_PROC_BROWSER_TEST_F(AppControllerNewProfileManagementBrowserTest,
                        AboutChromeForcesUserManager) {
   base::scoped_nsobject<AppController> ac([[AppController alloc] init]);
 
   // Create the guest profile, and set it as the last used profile so the
   // app controller can use it on init.
-  CreateAndWaitForGuestProfile();
+  CreateAndWaitForSystemProfile();
   PrefService* local_state = g_browser_process->local_state();
   local_state->SetString(prefs::kProfileLastUsed, chrome::kGuestProfileDir);
 
   // Prohibiting guest mode forces the user manager flow for About Chrome.
   local_state->SetBoolean(prefs::kBrowserGuestModeEnabled, false);
 
   Profile* guest_profile = [ac lastProfile];
   EXPECT_EQ(ProfileManager::GetGuestProfilePath(), guest_profile->GetPath());
   EXPECT_TRUE(guest_profile->IsGuestSession());
 
@@ skipping 300 matching lines @@
   ui_test_utils::NavigateToURL(browser3, test_url1);
   EXPECT_EQ(g_handoff_url, GURL());
 
   // Activate the original browser window.
   Browser* browser1 = active_browser_list->get(0);
   browser1->window()->Show();
   EXPECT_EQ(g_handoff_url, test_url2);
 }
 
 }  // namespace