Revert of Revert of Call to CrosSettings::Set() is replaced by OwnerSettingsService::Set() in VersionUpda...

chrome/browser/ui/webui/flags_ui.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/ui/webui/flags_ui.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 274 matching lines @@
 FlagsUI::FlagsUI(content::WebUI* web_ui)
     : WebUIController(web_ui),
       weak_factory_(this) {
   Profile* profile = Profile::FromWebUI(web_ui);
 
   FlagsDOMHandler* handler = new FlagsDOMHandler();
   web_ui->AddMessageHandler(handler);
 
 #if defined(OS_CHROMEOS)
   if (base::SysInfo::IsRunningOnChromeOS() &&
-      chromeos::OwnerSettingsServiceChromeOSFactory::GetForProfile(profile)) {
+      chromeos::OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(
+          profile)) {
     chromeos::OwnerSettingsServiceChromeOS* service =
-        chromeos::OwnerSettingsServiceChromeOSFactory::GetForProfile(profile);
+        chromeos::OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(
+            profile);
     service->IsOwnerAsync(base::Bind(
         &FinishInitialization, weak_factory_.GetWeakPtr(), profile, handler));
   } else {
-    FinishInitialization(weak_factory_.GetWeakPtr(),
-                         profile,
-                         handler,
+    FinishInitialization(weak_factory_.GetWeakPtr(), profile, handler,
                          false /* current_user_is_owner */);
   }
 #else
   handler->Init(new about_flags::PrefServiceFlagsStorage(
                     g_browser_process->local_state()),
                 about_flags::kOwnerAccessToFlags);
 #endif
 
   // Set up the about:flags source.
   content::WebUIDataSource::Add(profile, CreateFlagsUIHTMLSource());
@@ skipping 15 matching lines @@
 }
 
 #if defined(OS_CHROMEOS)
 // static
 void FlagsUI::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterListPref(prefs::kEnabledLabsExperiments,
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 #endif