Put Kiosk App parameters into device settings.

chrome/browser/chromeos/settings/cros_settings.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/cros_settings.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/settings/device_settings_provider.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
-#include "chrome/browser/chromeos/settings/kiosk_app_local_settings.h"
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
 #include "chrome/browser/chromeos/settings/system_settings_provider.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 namespace chromeos {
@@ skipping 270 matching lines @@
                  base::Unretained(this)));
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kStubCrosSettings)) {
     AddSettingsProvider(new StubCrosSettingsProvider(notify_cb));
   } else {
     AddSettingsProvider(
         new DeviceSettingsProvider(notify_cb, DeviceSettingsService::Get()));
   }
   // System settings are not mocked currently.
   AddSettingsProvider(new SystemSettingsProvider(notify_cb));
-  // Kiosk app settings are not mocked.
-  AddSettingsProvider(new KioskAppLocalSettings(notify_cb));
 }
 
 CrosSettings::~CrosSettings() {
   STLDeleteElements(&providers_);
   STLDeleteValues(&settings_observers_);
 }
 
 void CrosSettings::FireObservers(const std::string& path) {
   DCHECK(CalledOnValidThread());
   SettingsObserverMap::iterator observer_iterator =
@@ skipping 24 matching lines @@
 }
 
 ScopedTestCrosSettings::~ScopedTestCrosSettings() {
   if (initialized_cros_settings_)
     CrosSettings::Shutdown();
   if (initialized_device_settings_service_)
     DeviceSettingsService::Shutdown();
 }
 
 }  // namespace chromeos