| Index: chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| index ade19b4326bd68139bbfb9d36225aaecb46f4b6e..20ef4bd46e5e956f2dc2f41a6531b6f320742755 100644
|
| --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| @@ -134,37 +134,40 @@ class FakeSessionManagerClient : public chromeos::SessionManagerClient {
|
| virtual void NotifyLockScreenDismissed() OVERRIDE {}
|
| virtual void RetrieveDevicePolicy(
|
| const RetrievePolicyCallback& callback) OVERRIDE {
|
| - MessageLoop::current()->PostTask(FROM_HERE,
|
| - base::Bind(callback, device_policy_));
|
| + base::MessageLoop::current()->PostTask(
|
| + FROM_HERE, base::Bind(callback, device_policy_));
|
| }
|
| virtual void RetrieveUserPolicy(
|
| const RetrievePolicyCallback& callback) OVERRIDE {
|
| - MessageLoop::current()->PostTask(FROM_HERE,
|
| - base::Bind(callback, user_policy_));
|
| + base::MessageLoop::current()->PostTask(FROM_HERE,
|
| + base::Bind(callback, user_policy_));
|
| }
|
| virtual void RetrieveDeviceLocalAccountPolicy(
|
| const std::string& account_id,
|
| const RetrievePolicyCallback& callback) OVERRIDE {
|
| - MessageLoop::current()->PostTask(
|
| + base::MessageLoop::current()->PostTask(
|
| FROM_HERE,
|
| base::Bind(callback, device_local_account_policy_[account_id]));
|
| }
|
| virtual void StoreDevicePolicy(const std::string& policy_blob,
|
| const StorePolicyCallback& callback) OVERRIDE {
|
| device_policy_ = policy_blob;
|
| - MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, true));
|
| + base::MessageLoop::current()->PostTask(FROM_HERE,
|
| + base::Bind(callback, true));
|
| }
|
| virtual void StoreUserPolicy(const std::string& policy_blob,
|
| const StorePolicyCallback& callback) OVERRIDE {
|
| user_policy_ = policy_blob;
|
| - MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, true));
|
| + base::MessageLoop::current()->PostTask(FROM_HERE,
|
| + base::Bind(callback, true));
|
| }
|
| virtual void StoreDeviceLocalAccountPolicy(
|
| const std::string& account_id,
|
| const std::string& policy_blob,
|
| const StorePolicyCallback& callback) OVERRIDE {
|
| device_local_account_policy_[account_id] = policy_blob;
|
| - MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, true));
|
| + base::MessageLoop::current()->PostTask(FROM_HERE,
|
| + base::Bind(callback, true));
|
| }
|
|
|
| const std::string& device_policy() const {
|
| @@ -244,20 +247,18 @@ class FakeCryptohomeClient : public chromeos::CryptohomeClient {
|
| virtual void GetSanitizedUsername(
|
| const std::string& username,
|
| const chromeos::StringDBusMethodCallback& callback) OVERRIDE {
|
| - MessageLoop::current()->PostTask(
|
| + base::MessageLoop::current()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(callback,
|
| - chromeos::DBUS_METHOD_CALL_SUCCESS,
|
| - username));
|
| - MessageLoop::current()->PostTask(
|
| + base::Bind(callback, chromeos::DBUS_METHOD_CALL_SUCCESS, username));
|
| + base::MessageLoop::current()->PostTask(
|
| FROM_HERE, base::Bind(data_handler_, 1, true, username));
|
| }
|
| virtual void AsyncMount(const std::string& username,
|
| const std::string& key,
|
| int flags,
|
| const AsyncMethodCallback& callback) OVERRIDE {
|
| - MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, 1));
|
| - MessageLoop::current()->PostTask(
|
| + base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, 1));
|
| + base::MessageLoop::current()->PostTask(
|
| FROM_HERE, base::Bind(handler_, 1, true, cryptohome::MOUNT_ERROR_NONE));
|
| }
|
| virtual void AsyncMountGuest(const AsyncMethodCallback& callback) OVERRIDE {}
|
| @@ -437,8 +438,8 @@ class DeviceLocalAccountTest : public InProcessBrowserTest {
|
|
|
| virtual void CleanUpOnMainThread() OVERRIDE {
|
| // This shuts down the login UI.
|
| - MessageLoop::current()->PostTask(FROM_HERE,
|
| - base::Bind(&chrome::AttemptExit));
|
| + base::MessageLoop::current()->PostTask(FROM_HERE,
|
| + base::Bind(&chrome::AttemptExit));
|
| base::RunLoop().RunUntilIdle();
|
| }
|
|
|
|
|