Fix up Owner settings on first load

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"
@@ skipping 185 matching lines @@
 ScopedDeviceSettingsTestHelper::~ScopedDeviceSettingsTestHelper() {
   Flush();
   DeviceSettingsService::Get()->UnsetSessionManager();
   DeviceSettingsService::Shutdown();
 }
 
 DeviceSettingsTestBase::DeviceSettingsTestBase()
     : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
       user_manager_(new FakeChromeUserManager()),
       user_manager_enabler_(user_manager_),
-      owner_key_util_(new ownership::MockOwnerKeyUtil()) {
+      owner_key_util_(new ownership::MockOwnerKeyUtil()),
+      cros_settings_(&device_settings_service_) {
   OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(
       &device_settings_service_);
   OwnerSettingsServiceChromeOSFactory::GetInstance()->SetOwnerKeyUtilForTesting(
       owner_key_util_);
+  OwnerSettingsServiceChromeOSFactory::SetCrosSettingsForTesting(
+      &cros_settings_);
 }
 
 DeviceSettingsTestBase::~DeviceSettingsTestBase() {
   base::RunLoop().RunUntilIdle();
 }
 
 void DeviceSettingsTestBase::SetUp() {
   // Initialize DBusThreadManager with a stub implementation.
   dbus_setter_ = chromeos::DBusThreadManager::GetSetterForTesting();
 
   base::RunLoop().RunUntilIdle();
 
   device_policy_.payload().mutable_metrics_enabled()->set_metrics_enabled(
       false);
   owner_key_util_->SetPublicKeyFromPrivateKey(*device_policy_.GetSigningKey());
   device_policy_.Build();
   device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
   device_settings_service_.SetSessionManager(&device_settings_test_helper_,
                                              owner_key_util_);
   profile_.reset(new TestingProfile());
 }
 
 void DeviceSettingsTestBase::TearDown() {
+  OwnerSettingsServiceChromeOSFactory::SetCrosSettingsForTesting(nullptr);
   OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(NULL);
   FlushDeviceSettings();
   device_settings_service_.UnsetSessionManager();
   DBusThreadManager::Shutdown();
 }
 
 void DeviceSettingsTestBase::FlushDeviceSettings() {
   device_settings_test_helper_.Flush();
 }
 
@@ skipping 15 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