Fix up Owner settings on first load

chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc

 // Copyright 2014 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/ownership/owner_settings_service_chromeos_factory.h"
 
 #include "base/path_service.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/chromeos_paths.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/ownership/owner_key_util.h"
 #include "components/ownership/owner_key_util_impl.h"
 
 namespace chromeos {
 
 namespace {
 
 DeviceSettingsService* g_device_settings_service_for_testing_ = nullptr;
+CrosSettings* g_cros_settings_for_testing = nullptr;
 
 DeviceSettingsService* GetDeviceSettingsService() {
   if (g_device_settings_service_for_testing_)
     return g_device_settings_service_for_testing_;
   return DeviceSettingsService::IsInitialized() ? DeviceSettingsService::Get()
                                                 : nullptr;
 }
 
+CrosSettings* GetCrosSettings() {
+  if (g_cros_settings_for_testing)
+    return g_cros_settings_for_testing;
+  return CrosSettings::IsInitialized() ? CrosSettings::Get() : nullptr;
+}
+
 }  // namespace
 
 OwnerSettingsServiceChromeOSFactory::OwnerSettingsServiceChromeOSFactory()
     : BrowserContextKeyedServiceFactory(
           "OwnerSettingsService",
           BrowserContextDependencyManager::GetInstance()) {
 }
 
 OwnerSettingsServiceChromeOSFactory::~OwnerSettingsServiceChromeOSFactory() {
 }
@@ skipping 11 matching lines @@
 OwnerSettingsServiceChromeOSFactory::GetInstance() {
   return Singleton<OwnerSettingsServiceChromeOSFactory>::get();
 }
 
 // static
 void OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(
     DeviceSettingsService* device_settings_service) {
   g_device_settings_service_for_testing_ = device_settings_service;
 }
 
+// static
+void OwnerSettingsServiceChromeOSFactory::SetCrosSettingsForTesting(
+    CrosSettings* cros_settings) {
+  g_cros_settings_for_testing = cros_settings;
+}
+
 scoped_refptr<ownership::OwnerKeyUtil>
 OwnerSettingsServiceChromeOSFactory::GetOwnerKeyUtil() {
   if (owner_key_util_.get())
     return owner_key_util_;
   base::FilePath public_key_path;
   if (!PathService::Get(chromeos::FILE_OWNER_KEY, &public_key_path))
     return NULL;
   owner_key_util_ = new ownership::OwnerKeyUtilImpl(public_key_path);
   return owner_key_util_;
 }
 
 void OwnerSettingsServiceChromeOSFactory::SetOwnerKeyUtilForTesting(
     const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util) {
   owner_key_util_ = owner_key_util;
 }
 
 // static
 KeyedService* OwnerSettingsServiceChromeOSFactory::BuildInstanceFor(
     content::BrowserContext* browser_context) {
   Profile* profile = static_cast<Profile*>(browser_context);
   if (profile->IsGuestSession() || ProfileHelper::IsSigninProfile(profile))
     return NULL;
   return new OwnerSettingsServiceChromeOS(
       GetDeviceSettingsService(),
+      GetCrosSettings(),
       profile,
       GetInstance()->GetOwnerKeyUtil());
 }
 
 bool OwnerSettingsServiceChromeOSFactory::ServiceIsCreatedWithBrowserContext()
     const {
   return true;
 }
 
 KeyedService* OwnerSettingsServiceChromeOSFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   return BuildInstanceFor(context);
 }
 
 }  // namespace chromeos