Clean up Smart Lock cryptohome keys logic:

chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_CREATE_KEYS_OPERATION_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_CREATE_KEYS_OPERATION_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 13 matching lines @@
   typedef base::Callback<void (bool success)> CreateKeysCallback;
   EasyUnlockCreateKeysOperation(
       const UserContext& user_context,
       const std::string& tpm_public_key,
       const EasyUnlockDeviceKeyDataList& devices,
       const CreateKeysCallback& callback);
   ~EasyUnlockCreateKeysOperation();
 
   void Start();
 
-  const UserContext& user_context() const { return user_context_; }
+  // The UserContext returned will contain the new key if called after the
+  // operation has completed successfully.
+  const UserContext& user_context() { return user_context_; }

[xiyuan, 2014/12/17 21:02:42]

nit: Can we put back "const"?

[Tim Song, 2014/12/17 21:45:23]

Done.

 
  private:
   class ChallengeCreator;
 
   void CreateKeyForDeviceAtIndex(size_t index);
   void OnChallengeCreated(size_t index, bool success);
   void OnGetSystemSalt(size_t index,
                        const std::string& system_salt);
   void OnKeyCreated(size_t index,
                     const Key& user_key,
@@ skipping 11 matching lines @@
   scoped_ptr<ChallengeCreator> challenge_creator_;
 
   base::WeakPtrFactory<EasyUnlockCreateKeysOperation> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EasyUnlockCreateKeysOperation);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_CREATE_KEYS_OPERATION_H_