chromeos: Remove SystemSaltGetter::GetSystemSaltSync

chromeos/dbus/mock_dbus_thread_manager.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 "chromeos/dbus/mock_dbus_thread_manager.h"
 
+#include "base/message_loop/message_loop.h"
 #include "chromeos/dbus/dbus_thread_manager_observer.h"
 #include "chromeos/dbus/fake_bluetooth_adapter_client.h"
 #include "chromeos/dbus/fake_bluetooth_agent_manager_client.h"
 #include "chromeos/dbus/fake_bluetooth_device_client.h"
 #include "chromeos/dbus/fake_bluetooth_input_client.h"
 #include "chromeos/dbus/fake_bluetooth_profile_manager_client.h"
 #include "chromeos/dbus/fake_gsm_sms_client.h"
 #include "chromeos/dbus/fake_nfc_manager_client.h"
 #include "chromeos/dbus/fake_shill_device_client.h"
 #include "chromeos/dbus/fake_shill_ipconfig_client.h"
 #include "chromeos/dbus/ibus/mock_ibus_client.h"
 #include "chromeos/dbus/ibus/mock_ibus_engine_factory_service.h"
 #include "chromeos/dbus/ibus/mock_ibus_engine_service.h"
 #include "chromeos/dbus/mock_cryptohome_client.h"
 #include "chromeos/dbus/mock_shill_manager_client.h"
 #include "chromeos/dbus/mock_shill_profile_client.h"
 #include "chromeos/dbus/mock_shill_service_client.h"
 #include "chromeos/dbus/mock_session_manager_client.h"
 #include "chromeos/dbus/power_policy_controller.h"
 
 using ::testing::AnyNumber;
+using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::ReturnNull;
-using ::testing::SetArgumentPointee;
 using ::testing::_;
 
 namespace chromeos {
 
 namespace {
 
-std::vector<uint8>* GetMockSystemSalt() {
-  static std::vector<uint8>* s_system_salt = NULL;
-  if (!s_system_salt) {
-    const char kStubSystemSalt[] = "stub_system_salt";
-    s_system_salt = new std::vector<uint8>();
-    s_system_salt->assign(kStubSystemSalt,
-                          kStubSystemSalt + arraysize(kStubSystemSalt) - 1);
-  }
-  return s_system_salt;
+void GetMockSystemSalt(
+    const CryptohomeClient::GetSystemSaltCallback& callback) {
+  const char kStubSystemSalt[] = "stub_system_salt";
+  base::MessageLoop::current()->PostTask(
+      FROM_HERE,
+      base::Bind(callback,
+                 DBUS_METHOD_CALL_SUCCESS,
+                 std::vector<uint8>(
+                     kStubSystemSalt,
+                     kStubSystemSalt + arraysize(kStubSystemSalt) - 1)));
 }
 
 }  // namespace
 
 MockDBusThreadManager::MockDBusThreadManager()
     : fake_bluetooth_adapter_client_(new FakeBluetoothAdapterClient),
       fake_bluetooth_agent_manager_client_(
           new FakeBluetoothAgentManagerClient),
       fake_bluetooth_device_client_(new FakeBluetoothDeviceClient),
       fake_bluetooth_input_client_(new FakeBluetoothInputClient),
@@ skipping 50 matching lines @@
   EXPECT_CALL(*mock_session_manager_client_.get(), HasObserver(_))
       .Times(AnyNumber());
 
   // Called from AsyncMethodCaller ctor and dtor.
   EXPECT_CALL(*mock_cryptohome_client_.get(), SetAsyncCallStatusHandlers(_, _))
       .Times(AnyNumber());
   EXPECT_CALL(*mock_cryptohome_client_.get(), ResetAsyncCallStatusHandlers())
       .Times(AnyNumber());
   // Called from various locations.
   EXPECT_CALL(*mock_cryptohome_client_.get(), GetSystemSalt(_))
-      .WillRepeatedly(DoAll(SetArgumentPointee<0>(*GetMockSystemSalt()),
-                            Return(true)));
+      .WillRepeatedly(Invoke(&GetMockSystemSalt));
   EXPECT_CALL(*mock_cryptohome_client_.get(), TpmIsEnabled(_))
       .Times(AnyNumber());
 
   // Called from GeolocationHandler::Init().
   EXPECT_CALL(*mock_shill_manager_client_.get(), GetProperties(_))
       .Times(AnyNumber());
   EXPECT_CALL(*mock_shill_manager_client_.get(), AddPropertyChangedObserver(_))
       .Times(AnyNumber());
   EXPECT_CALL(*mock_shill_manager_client_.get(),
               RemovePropertyChangedObserver(_))
@@ skipping 10 matching lines @@
   observers_.AddObserver(observer);
 }
 
 void MockDBusThreadManager::RemoveObserver(
     DBusThreadManagerObserver* observer) {
   DCHECK(observer);
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace chromeos