settings: Add async system salt retrieval logic in DeviceOAuth2TokenServiceFactory

chromeos/dbus/fake_cryptohome_client.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_FAKE_CRYPTOHOME_CLIENT_H_
 #define CHROMEOS_DBUS_FAKE_CRYPTOHOME_CLIENT_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 144 matching lines @@
 
   // Changes the behavior of WaitForServiceToBeAvailable(). This method runs
   // pending callbacks if is_available is true.
   void SetServiceIsAvailable(bool is_available);
 
   // Sets the unmount result of Unmount() call.
   void set_unmount_result(bool result) {
     unmount_result_= result;
   }
 
+  // Sets the system salt which will be returned from GetSystemSalt().
+  void set_system_salt(const std::vector<uint8>& system_salt) {
+    system_salt_ = system_salt;
+  }
+
   // Returns the stub system salt as raw bytes. (not as a string encoded in the
   // format used by SystemSaltGetter::ConvertRawSaltToHexString()).

[hashimoto, 2013/10/24 07:49:01]

nit: Could you make it clear that GetSystemSalt() returns this value by default,
but set_system_salt can override it?

[satorux1, 2013/10/24 08:31:28]

Done.

   static std::vector<uint8> GetStubSystemSalt();
 
  private:
   // Posts tasks which return fake results to the UI thread.
   void ReturnAsyncMethodResult(const AsyncMethodCallback& callback,
                                bool returns_data);
 
   // This method is used to implement ReturnAsyncMethodResult.
   void ReturnAsyncMethodResultInternal(const AsyncMethodCallback& callback,
                                        bool returns_data);
 
   bool service_is_available_;
   int async_call_id_;
   AsyncCallStatusHandler async_call_status_handler_;
   AsyncCallStatusWithDataHandler async_call_status_data_handler_;
   int tpm_is_ready_counter_;
   bool unmount_result_;
+  std::vector<uint8> system_salt_;
 
   std::vector<WaitForServiceToBeAvailableCallback>
       pending_wait_for_service_to_be_available_callbacks_;
 
   // A stub store for InstallAttributes, mapping an attribute name to the
   // associated data blob. Used to implement InstallAttributesSet and -Get.
   std::map<std::string, std::vector<uint8> > install_attrs_;
   bool locked_;
   base::WeakPtrFactory<FakeCryptohomeClient> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeCryptohomeClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_FAKE_CRYPTOHOME_CLIENT_H_