Prepare password_bubble_experiment and password_manager_util for componentisation

chrome/browser/ui/webui/options/browser_options_handler.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/options/browser_options_handler.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 292 matching lines @@
       IDS_SHORT_PRODUCT_NAME },
     { "linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF },
     { "manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK },
     { "manageLanguages", IDS_OPTIONS_TRANSLATE_MANAGE_LANGUAGES },
     { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK },
     { "metricsReportingResetRestart", IDS_OPTIONS_ENABLE_LOGGING_RESTART },
     { "networkPredictionEnabledDescription",
       IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION },
     { "passwordManagerEnabled",
       password_bubble_experiment::IsSmartLockBrandingEnabled(
-          Profile::FromWebUI(web_ui())) ?
+          ProfileSyncServiceFactory::GetForProfile(
+              Profile::FromWebUI(web_ui()))) ?
       IDS_OPTIONS_PASSWORD_MANAGER_SMART_LOCK_ENABLE :
       IDS_OPTIONS_PASSWORD_MANAGER_ENABLE },
     { "passwordsAndAutofillGroupName",
       IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME },
     { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON },
     { "privacyContentSettingsButton",
       IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON },
     { "profileAddPersonEnable", IDS_PROFILE_ADD_PERSON_ENABLE },
     { "profileBrowserGuestEnable", IDS_PROFILE_BROWSER_GUEST_ENABLE },
     { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL },
@@ skipping 1848 matching lines @@
 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns,
                                             const policy::PolicyMap& previous,
                                             const policy::PolicyMap& current) {
   std::set<std::string> different_keys;
   current.GetDifferingKeys(previous, &different_keys);
   if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled))
     SetupMetricsReportingCheckbox();
 }
 
 }  // namespace options