Prevent a DCHECK when starting a chromeos=1 build with --stub-cros-settings.

chrome/browser/chromeos/settings/stub_cros_settings_provider.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/stub_cros_settings_provider.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
+#include "chrome/browser/chromeos/settings/device_settings_provider.h"
 
 namespace chromeos {
 
-namespace {
-
-const char* kHandledSettings[] = {
-  kAccountsPrefAllowGuest,
-  kAccountsPrefAllowNewUser,
-  kAccountsPrefShowUserNamesOnSignIn,
-  kAccountsPrefUsers,
-  kAccountsPrefEphemeralUsersEnabled,
-  kAccountsPrefDeviceLocalAccounts,
-  kDeviceOwner,
-  kPolicyMissingMitigationMode,
-  kReleaseChannel,
-  kReportDeviceVersionInfo,
-  kReportDeviceActivityTimes,
-  kReportDeviceBootMode,
-  kReportDeviceLocation,
-  kSettingProxyEverywhere,
-  kSignedDataRoamingEnabled,
-  kStatsReportingPref,
-  kSystemTimezonePolicy,
-  // Kiosk mode settings.
-  kIdleLogoutTimeout,
-  kIdleLogoutWarningDuration,
-  kScreenSaverExtensionId,
-  kScreenSaverTimeout
-};
-
-}  // namespace
-
 StubCrosSettingsProvider::StubCrosSettingsProvider(
     const NotifyObserversCallback& notify_cb)
     : CrosSettingsProvider(notify_cb) {
   SetDefaults();
 }
 
 StubCrosSettingsProvider::StubCrosSettingsProvider()
   : CrosSettingsProvider(CrosSettingsProvider::NotifyObserversCallback()) {
   SetDefaults();
 }
@@ skipping 10 matching lines @@
   return NULL;
 }
 
 CrosSettingsProvider::TrustedStatus
     StubCrosSettingsProvider::PrepareTrustedValues(const base::Closure& cb) {
   // We don't have a trusted store so all values are available immediately.
   return TRUSTED;
 }
 
 bool StubCrosSettingsProvider::HandlesSetting(const std::string& path) const {
-  const char** end = kHandledSettings + arraysize(kHandledSettings);
-  return std::find(kHandledSettings, end, path) != end;
+  static const char** begin = DeviceSettingsProvider::kKnownSettingsBegin;
+  static const char** end = DeviceSettingsProvider::kKnownSettingsEnd;
+  return std::find(begin, end, path) != end;
 }
 
 void StubCrosSettingsProvider::DoSet(const std::string& path,
                                      const base::Value& value) {
   values_.SetValue(path, value.DeepCopy());
   NotifyObservers(path);
 }
 
 void StubCrosSettingsProvider::SetDefaults() {
   values_.SetBoolean(kAccountsPrefAllowGuest, true);
   values_.SetBoolean(kAccountsPrefAllowNewUser, true);
   values_.SetBoolean(kAccountsPrefShowUserNamesOnSignIn, true);
   values_.SetValue(kAccountsPrefDeviceLocalAccounts, new ListValue);
   // |kDeviceOwner| will be set to the logged-in user by |UserManager|.
 }
 
 }  // namespace chromeos