Make supervised user ChromeOS import aware of new password schema.

chrome/browser/managed_mode/managed_user_registration_utility.cc

 // Copyright 2013 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/managed_mode/managed_user_registration_utility.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 210 matching lines @@
 }
 
 void ManagedUserRegistrationUtilityImpl::Register(
     const std::string& managed_user_id,
     const ManagedUserRegistrationInfo& info,
     const RegistrationCallback& callback) {
   DCHECK(pending_managed_user_id_.empty());
   callback_ = callback;
   pending_managed_user_id_ = managed_user_id;
 
+  bool need_password_update = !info.password_data.empty();
   const base::DictionaryValue* dict =
       prefs_->GetDictionary(prefs::kManagedUsers);
   is_existing_managed_user_ = dict->HasKey(managed_user_id);
   if (!is_existing_managed_user_) {
     managed_user_sync_service_->AddManagedUser(pending_managed_user_id_,
                                                base::UTF16ToUTF8(info.name),
                                                info.master_key,
                                                info.password_signature_key,
                                                info.password_encryption_key,
                                                info.avatar_index);
@@ skipping 17 matching lines @@
     if (keys_need_update) {
       managed_user_sync_service_->UpdateManagedUser(
           pending_managed_user_id_,
           base::UTF16ToUTF8(info.name),
           info.master_key,
           info.password_signature_key,
           info.password_encryption_key,
           info.avatar_index);
     } else {
       // The user already exists and does not need to be updated.
+      need_password_update = false;
       OnManagedUserAcknowledged(managed_user_id);
     }
     avatar_updated_ =
         managed_user_sync_service_->UpdateManagedUserAvatarIfNeeded(
             managed_user_id,
             info.avatar_index);
   }
 #if defined(OS_CHROMEOS)
   const char* kAvatarKey = managed_users::kChromeOSAvatarIndex;
 #else
   const char* kAvatarKey = managed_users::kChromeAvatarIndex;
 #endif
   managed_user_shared_settings_service_->SetValue(
       pending_managed_user_id_, kAvatarKey,
       base::FundamentalValue(info.avatar_index));
-  if (!info.password_data.empty()) {
+  if (need_password_update) {
     password_update_.reset(new ManagedUserSharedSettingsUpdate(
         managed_user_shared_settings_service_,
         pending_managed_user_id_,
         managed_users::kChromeOSPasswordData,
         scoped_ptr<base::Value>(info.password_data.DeepCopy()),
         base::Bind(
             &ManagedUserRegistrationUtilityImpl::OnPasswordChangeAcknowledged,
             weak_ptr_factory_.GetWeakPtr())));
   }
 
@@ skipping 97 matching lines @@
           pending_managed_user_id_);
     }
   }
 
   if (run_callback)
     callback_.Run(error, pending_managed_user_token_);
   callback_.Reset();
 }
 
 } // namespace