Move User Manager onto a System profile.

chrome/browser/ui/views/profiles/user_manager_view.cc

Index: chrome/browser/ui/views/profiles/user_manager_view.cc
diff --git a/chrome/browser/ui/views/profiles/user_manager_view.cc b/chrome/browser/ui/views/profiles/user_manager_view.cc
index 2f9ed334a4cb052449fa97752ed0fe7581d18435..5b65703b32d770dd5a4f5d91efce63d3711b0c4b 100644
--- a/chrome/browser/ui/views/profiles/user_manager_view.cc
+++ b/chrome/browser/ui/views/profiles/user_manager_view.cc
@@ -61,13 +61,13 @@ void UserManager::Show(
     return;
   }
 
-  // Create the guest profile, if necessary, and open the user manager
-  // from the guest profile.
-  profiles::CreateGuestProfileForUserManager(
+  // Create the system profile, if necessary, and open the user manager
+  // from the system profile.
+  profiles::CreateSystemProfileForUserManager(
       profile_path_to_focus,
       tutorial_mode,
       profile_open_action,
-      base::Bind(&UserManagerView::OnGuestProfileCreated,
+      base::Bind(&UserManagerView::OnSystemProfileCreated,
                  base::Passed(make_scoped_ptr(new UserManagerView))));
 }
 
@@ -91,9 +91,9 @@ UserManagerView::~UserManagerView() {
 }
 
 // static
-void UserManagerView::OnGuestProfileCreated(
+void UserManagerView::OnSystemProfileCreated(
     scoped_ptr<UserManagerView> instance,
-    Profile* guest_profile,
+    Profile* system_profile,
     const std::string& url) {
   // If we are showing the User Manager after locking a profile, change the
   // active profile to Guest.
@@ -101,11 +101,11 @@ void UserManagerView::OnGuestProfileCreated(
 
   DCHECK(!instance_);
   instance_ = instance.release();  // |instance_| takes over ownership.
-  instance_->Init(guest_profile, GURL(url));
+  instance_->Init(system_profile, GURL(url));
 }
 
-void UserManagerView::Init(Profile* guest_profile, const GURL& url) {
-  web_view_ = new views::WebView(guest_profile);
+void UserManagerView::Init(Profile* system_profile, const GURL& url) {
+  web_view_ = new views::WebView(system_profile);
   web_view_->set_allow_accelerators(true);
   AddChildView(web_view_);
   SetLayoutManager(new views::FillLayout);
@@ -149,7 +149,7 @@ void UserManagerView::Init(Profile* guest_profile, const GURL& url) {
   // Set the app id for the task manager to the app id of its parent
   ui::win::SetAppIdForWindow(
       ShellIntegration::GetChromiumModelIdForProfile(
-          guest_profile->GetPath()),
+          system_profile->GetPath()),
       views::HWNDForWidget(GetWidget()));
 #endif