PART1: Initiated the SignedSettings refactoring.

chrome/browser/ui/webui/flags_ui.cc

 // Copyright (c) 2011 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/flags_ui.h"
 
 #include <string>
 
 #include "base/memory/singleton.h"
 #include "base/utf_string_conversions.h"
@@ skipping 11 matching lines @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/user_cros_settings_provider.h"
+#include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #endif
 
 namespace {
 
 ChromeWebUIDataSource* CreateFlagsUIHTMLSource() {
   ChromeWebUIDataSource* source =
       new ChromeWebUIDataSource(chrome::kChromeUIFlagsHost);
 
   source->AddLocalizedString("flagsLongTitle", IDS_FLAGS_LONG_TITLE);
   source->AddLocalizedString("flagsTableTitle", IDS_FLAGS_TABLE_TITLE);
   source->AddLocalizedString("flagsNoExperimentsAvailable",
                              IDS_FLAGS_NO_EXPERIMENTS_AVAILABLE);
   source->AddLocalizedString("flagsWarningHeader", IDS_FLAGS_WARNING_HEADER);
   source->AddLocalizedString("flagsBlurb", IDS_FLAGS_WARNING_TEXT);
 #if defined(OS_CHROMEOS)
   int ids = IDS_PRODUCT_OS_NAME;
 #else
   int ids = IDS_PRODUCT_NAME;
 #endif
   source->AddString("flagsRestartNotice", l10n_util::GetStringFUTF16(
       IDS_FLAGS_RELAUNCH_NOTICE, l10n_util::GetStringUTF16(ids)));
   source->AddLocalizedString("flagsRestartButton", IDS_FLAGS_RELAUNCH_BUTTON);
   source->AddLocalizedString("disable", IDS_FLAGS_DISABLE);
   source->AddLocalizedString("enable", IDS_FLAGS_ENABLE);
 #if defined(OS_CHROMEOS)
   // Set the strings to show which user can actually change the flags
   source->AddLocalizedString("ownerOnly", IDS_OPTIONS_ACCOUNTS_OWNER_ONLY);
-  source->AddString("ownerUserId", UTF8ToUTF16(
-      chromeos::UserCrosSettingsProvider::cached_owner()));
+  std::string owner;
+  chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
+  source->AddString("ownerUserId", UTF8ToUTF16(owner));
 #endif
 
   source->set_json_path("strings.js");
   source->add_resource_path("flags.js", IDR_FLAGS_JS);
 
   int idr = IDR_FLAGS_HTML;
 #if defined (OS_CHROMEOS)
   if (!chromeos::UserManager::Get()->current_user_is_owner())
     idr = IDR_FLAGS_HTML_WARNING;
 #endif
@@ skipping 89 matching lines @@
 // static
 RefCountedMemory* FlagsUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_FLAGS);
 }
 
 // static
 void FlagsUI::RegisterPrefs(PrefService* prefs) {
   prefs->RegisterListPref(prefs::kEnabledLabsExperiments);
 }