Revert "Abandon user sign in when policy is retrieved before session started."

chrome/browser/chromeos/settings/device_settings_test_helper.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 "chrome/browser/chromeos/settings/device_settings_test_helper.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/ownership/mock_owner_key_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_utils.h"
 
-using RetrievePolicyResponseType =
-    chromeos::DeviceSettingsTestHelper::RetrievePolicyResponseType;
-
 namespace chromeos {
 
 DeviceSettingsTestHelper::DeviceSettingsTestHelper() {}
 
 DeviceSettingsTestHelper::~DeviceSettingsTestHelper() {}
 
 void DeviceSettingsTestHelper::FlushStore() {
   std::vector<StorePolicyCallback> callbacks;
   callbacks.swap(device_policy_.store_callbacks_);
   for (std::vector<StorePolicyCallback>::iterator cb(callbacks.begin());
@@ skipping 11 matching lines @@
       cb->Run(device_local_account_state->second.store_result_);
     }
   }
 }
 
 void DeviceSettingsTestHelper::FlushRetrieve() {
   std::vector<RetrievePolicyCallback> callbacks;
   callbacks.swap(device_policy_.retrieve_callbacks_);
   for (std::vector<RetrievePolicyCallback>::iterator cb(callbacks.begin());
        cb != callbacks.end(); ++cb) {
-    cb->Run(device_policy_.policy_blob_, RetrievePolicyResponseType::SUCCESS);
+    cb->Run(device_policy_.policy_blob_);
   }
 
   std::map<std::string, PolicyState>::iterator device_local_account_state;
   for (device_local_account_state = device_local_account_policy_.begin();
        device_local_account_state != device_local_account_policy_.end();
        ++device_local_account_state) {
     std::vector<RetrievePolicyCallback> callbacks;
     callbacks.swap(device_local_account_state->second.retrieve_callbacks_);
     for (std::vector<RetrievePolicyCallback>::iterator cb(callbacks.begin());
          cb != callbacks.end(); ++cb) {
-      cb->Run(device_local_account_state->second.policy_blob_,
-              RetrievePolicyResponseType::SUCCESS);
+      cb->Run(device_local_account_state->second.policy_blob_);
     }
   }
 }
 
 void DeviceSettingsTestHelper::Flush() {
   do {
     content::RunAllBlockingPoolTasksUntilIdle();
     FlushStore();
     content::RunAllBlockingPoolTasksUntilIdle();
     FlushRetrieve();
@@ skipping 14 matching lines @@
   }
 
   return false;
 }
 
 void DeviceSettingsTestHelper::RetrieveDevicePolicy(
     const RetrievePolicyCallback& callback) {
   device_policy_.retrieve_callbacks_.push_back(callback);
 }
 
-RetrievePolicyResponseType
-DeviceSettingsTestHelper::BlockingRetrieveDevicePolicy(
-    std::string* policy_out) {
-  *policy_out = device_policy_.policy_blob_;
-  return RetrievePolicyResponseType::SUCCESS;
+std::string DeviceSettingsTestHelper::BlockingRetrieveDevicePolicy() {
+  return device_policy_.policy_blob_;
 }
 
 void DeviceSettingsTestHelper::RetrieveDeviceLocalAccountPolicy(
     const std::string& account_id,
     const RetrievePolicyCallback& callback) {
   device_local_account_policy_[account_id].retrieve_callbacks_.push_back(
       callback);
 }
 
-RetrievePolicyResponseType
-DeviceSettingsTestHelper::BlockingRetrieveDeviceLocalAccountPolicy(
-    const std::string& account_id,
-    std::string* policy_out) {
-  *policy_out = "";
-  return RetrievePolicyResponseType::SUCCESS;
+std::string DeviceSettingsTestHelper::BlockingRetrieveDeviceLocalAccountPolicy(
+    const std::string& account_id) {
+  return "";
 }
 
 void DeviceSettingsTestHelper::StoreDevicePolicy(
     const std::string& policy_blob,
     const StorePolicyCallback& callback) {
   device_policy_.policy_blob_ = policy_blob;
   device_policy_.store_callbacks_.push_back(callback);
 }
 
 void DeviceSettingsTestHelper::StoreDeviceLocalAccountPolicy(
@@ skipping 86 matching lines @@
         const_cast<user_manager::User*>(user));
   }
   OwnerSettingsServiceChromeOS* service =
       OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile_.get());
   CHECK(service);
   if (tpm_is_ready)
     service->OnTPMTokenReady(true /* token is enabled */);
 }
 
 }  // namespace chromeos