Switch to direct use of OwnerSettingsServiceChromeOS::Set() in tests.

chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc

 // Copyright 2013 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/ui/webui/extensions/chromeos/kiosk_apps_handler.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/sys_info.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "components/crx_file/id_util.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "extensions/common/extension_urls.h"
@@ skipping 59 matching lines @@
   const std::string candidate_id = path.substr(last_slash + 1);
   if (!crx_file::id_util::IdIsValid(candidate_id))
     return false;
 
   *app_id = candidate_id;
   return true;
 }
 
 }  // namespace
 
-KioskAppsHandler::KioskAppsHandler()
+KioskAppsHandler::KioskAppsHandler(OwnerSettingsServiceChromeOS* service)
     : kiosk_app_manager_(KioskAppManager::Get()),
       initialized_(false),
       is_kiosk_enabled_(false),
       is_auto_launch_enabled_(false),
+      owner_settings_service_(service),
       weak_ptr_factory_(this) {
   kiosk_app_manager_->AddObserver(this);
 }
 
 KioskAppsHandler::~KioskAppsHandler() {
   kiosk_app_manager_->RemoveObserver(this);
 }
 
 void KioskAppsHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("initializeKioskAppSettings",
@@ skipping 162 matching lines @@
 
   std::string input;
   CHECK(args->GetString(0, &input));
 
   std::string app_id;
   if (!ExtractsAppIdFromInput(input, &app_id)) {
     OnKioskAppDataLoadFailure(input);
     return;
   }
 
-  kiosk_app_manager_->AddApp(app_id);
+  kiosk_app_manager_->AddApp(app_id, owner_settings_service_);
 }
 
 void KioskAppsHandler::HandleRemoveKioskApp(const base::ListValue* args) {
   if (!initialized_ || !is_kiosk_enabled_)
     return;
 
   std::string app_id;
   CHECK(args->GetString(0, &app_id));
 
-  kiosk_app_manager_->RemoveApp(app_id);
+  kiosk_app_manager_->RemoveApp(app_id, owner_settings_service_);
 }
 
 void KioskAppsHandler::HandleEnableKioskAutoLaunch(
     const base::ListValue* args) {
   if (!initialized_ || !is_kiosk_enabled_ || !is_auto_launch_enabled_)
     return;
 
   std::string app_id;
   CHECK(args->GetString(0, &app_id));
 
-  kiosk_app_manager_->SetAutoLaunchApp(app_id);
+  kiosk_app_manager_->SetAutoLaunchApp(app_id, owner_settings_service_);
 }
 
 void KioskAppsHandler::HandleDisableKioskAutoLaunch(
     const base::ListValue* args) {
   if (!initialized_ || !is_kiosk_enabled_ || !is_auto_launch_enabled_)
     return;
 
   std::string app_id;
   CHECK(args->GetString(0, &app_id));
 
   std::string startup_app_id = kiosk_app_manager_->GetAutoLaunchApp();
   if (startup_app_id != app_id)
     return;
 
-  kiosk_app_manager_->SetAutoLaunchApp("");
+  kiosk_app_manager_->SetAutoLaunchApp("", owner_settings_service_);
 }
 
 void KioskAppsHandler::HandleSetDisableBailoutShortcut(
     const base::ListValue* args) {
   if (!initialized_ || !is_kiosk_enabled_)
     return;
 
   bool disable_bailout_shortcut;
   CHECK(args->GetBoolean(0, &disable_bailout_shortcut));
 
-  CrosSettings::Get()->SetBoolean(
+  owner_settings_service_->SetBoolean(
       kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled,
       !disable_bailout_shortcut);
 }
 
 void KioskAppsHandler::UpdateApp(const std::string& app_id) {
   KioskAppManager::App app_data;
   if (!kiosk_app_manager_->GetApp(app_id, &app_data))
     return;
 
   base::DictionaryValue app_dict;
   PopulateAppDict(app_data, &app_dict);
 
   web_ui()->CallJavascriptFunction("extensions.KioskAppsOverlay.updateApp",
                                    app_dict);
 }
 
 void KioskAppsHandler::ShowError(const std::string& app_id) {
   base::StringValue app_id_value(app_id);
   web_ui()->CallJavascriptFunction("extensions.KioskAppsOverlay.showError",
                                    app_id_value);
 
-  kiosk_app_manager_->RemoveApp(app_id);
+  kiosk_app_manager_->RemoveApp(app_id, owner_settings_service_);
 }
 
 }  // namespace chromeos