Sync starting language and input method preferences

chrome/browser/chromeos/login/users/fake_user_manager.cc

 // Copyright 2014 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/chromeos/login/users/fake_user_manager.h"
 
 #include "chrome/browser/chromeos/login/users/fake_supervised_user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "components/user_manager/user_type.h"
 
@@ skipping 65 matching lines @@
 
 void FakeUserManager::UserLoggedIn(const std::string& email,
                                    const std::string& username_hash,
                                    bool browser_restart) {
   for (UserList::const_iterator it = user_list_.begin();
        it != user_list_.end();
        ++it) {
     if ((*it)->username_hash() == username_hash) {
       (*it)->set_is_logged_in(true);
       logged_in_users_.push_back(*it);
+      (*it)->set_is_active(true);

[dzhioev (left Google), 2014/07/23 11:02:20]

Same true for these lines. Could you please rebase on ToT?

[michaelpg, 2014/07/25 23:49:08]

Done and done.

+      active_user_id_ = (*it)->email();
 
       if (!primary_user_)
         primary_user_ = *it;
       break;
     }
   }
 }
 
 User* FakeUserManager::GetActiveUserInternal() const {
   if (user_list_.size()) {
@@ skipping 12 matching lines @@
 const User* FakeUserManager::GetActiveUser() const {
   return GetActiveUserInternal();
 }
 
 User* FakeUserManager::GetActiveUser() {
   return GetActiveUserInternal();
 }
 
 void FakeUserManager::SwitchActiveUser(const std::string& email) {
   active_user_id_ = email;
+  if (user_list_.size() && !active_user_id_.empty()) {
+    for (UserList::const_iterator it = user_list_.begin();
+         it != user_list_.end(); ++it) {
+      if ((*it)->email() == active_user_id_)
+        (*it)->set_is_active(true);

[dzhioev (left Google), 2014/07/24 20:31:34]

Currently active user should be marked as inactive.

[michaelpg, 2014/07/25 23:49:08]

Done.

+    }
+  }
 }
 
 void FakeUserManager::SaveUserDisplayName(
     const std::string& username,
     const base::string16& display_name) {
   for (UserList::iterator it = user_list_.begin();
        it != user_list_.end(); ++it) {
     if ((*it)->email() == username) {
       (*it)->set_display_name(display_name);
       return;
@@ skipping 135 matching lines @@
 
 UserFlow* FakeUserManager::GetUserFlow(const std::string& email) const {
   return NULL;
 }
 
 bool FakeUserManager::AreLocallyManagedUsersAllowed() const {
   return true;
 }
 
 }  // namespace chromeos