Do not set kGoogleServicesUsername for device-local accounts

chrome/browser/chromeos/login/login_utils.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/login_utils.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 447 matching lines @@
         UserManager::Get()->GetSupervisedUserManager()->
             GetUserSyncId(active_user->email());
 
     // TODO(ibraaaa): Remove that when 97% of our users are using M31.
     // http://crbug.com/276163
     if (managed_user_sync_id.empty())
       managed_user_sync_id = "DUMMY_ID";
 
     user_profile->GetPrefs()->SetString(prefs::kManagedUserId,
                                         managed_user_sync_id);
-  } else {
+  } else if (UserManager::Get()->IsLoggedInAsRegularUser()) {
     // Make sure that the google service username is properly set (we do this
     // on every sign in, not just the first login, to deal with existing
     // profiles that might not have it set yet).
     SigninManagerBase* signin_manager =
         SigninManagerFactory::GetForProfile(user_profile);
     signin_manager->SetAuthenticatedUsername(user_id);
   }
 }
 
 void LoginUtilsImpl::InitSessionRestoreStrategy() {
@@ skipping 478 matching lines @@
   CrosSettings* cros_settings = CrosSettings::Get();
   bool allow_new_user = false;
   cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
   if (allow_new_user)
     return true;
   return cros_settings->FindEmailInList(
       kAccountsPrefUsers, username, wildcard_match);
 }
 
 }  // namespace chromeos