Turning on MultiProfile by default for ChromeOS

chrome/browser/chromeos/login/user.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 179 matching lines @@
   virtual bool is_logged_in() const;
 
   // True if current user is active within the current session.
   virtual bool is_active() const;
 
   // True if the user Profile is created.
   bool is_profile_created() const {
     return profile_is_created_;
   }
 
+  static User* CreateRegularUser(const std::string& email);

[Nikita (slow), 2014/05/14 20:10:16]

I don't see this being used in this CL so makes sense to move back to private
API.

[zel, 2014/05/14 21:17:57]

Done.

+
  protected:
   friend class SupervisedUserManagerImpl;
   friend class UserManagerImpl;
   friend class UserImageManagerImpl;
   // For testing:
   friend class MockUserManager;
   friend class FakeLoginUtils;
   friend class FakeUserManager;
   friend class UserAddingScreenTest;
 
   // Do not allow anyone else to create new User instances.
-  static User* CreateRegularUser(const std::string& email);
   static User* CreateGuestUser();
   static User* CreateKioskAppUser(const std::string& kiosk_app_username);
   static User* CreateLocallyManagedUser(const std::string& username);
   static User* CreateRetailModeUser();
   static User* CreatePublicAccountUser(const std::string& email);
 
   explicit User(const std::string& email);
   virtual ~User();
 
   const std::string* GetAccountLocale() const {
     return account_locale_.get();
   }
 
   // Setters are private so only UserManager can call them.
   void SetAccountLocale(const std::string& resolved_account_locale);
 
   void SetImage(const UserImage& user_image, int image_index);
 
   void SetImageURL(const GURL& image_url);
 
   // Sets a stub image until the next |SetImage| call. |image_index| may be
   // one of |kExternalImageIndex| or |kProfileImageIndex|.
   // If |is_loading| is |true|, that means user image is being loaded from file.
   void SetStubImage(int image_index, bool is_loading);
 
   void set_display_name(const base::string16& display_name) {
     display_name_ = display_name;
   }
 
-  void set_given_name(const base::string16& given_name) { given_name_ = given_name; }
+  void set_given_name(const base::string16& given_name) {
+    given_name_ = given_name;
+  }
 
   void set_display_email(const std::string& display_email) {
     display_email_ = display_email;
   }
 
   const UserImage& user_image() const { return user_image_; }
 
   void set_oauth_token_status(OAuthTokenStatus status) {
     oauth_token_status_ = status;
   }
@@ skipping 68 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(User);
 };
 
 // List of known users.
 typedef std::vector<User*> UserList;
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_