MD Settings: Always provide recommended meta-data

chrome/browser/extensions/api/settings_private/prefs_util.cc

 // Copyright 2015 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/extensions/api/settings_private/prefs_util.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/browser/extensions/settings_api_helpers.h"
@@ skipping 460 matching lines @@
 #endif
 
   if (pref && pref->IsManaged()) {
     pref_object->controlled_by =
         settings_private::ControlledBy::CONTROLLED_BY_USER_POLICY;
     pref_object->enforcement =
         settings_private::Enforcement::ENFORCEMENT_ENFORCED;
     return pref_object;
   }
 
-  if (pref && pref->IsRecommended()) {
+  // A pref is recommended if it has a recommended value, regardless of whether
+  // the current value is set by policy. The UI will test to see whether the
+  // current value matches the recommended value and inform the user.
+  const base::Value* recommended = pref ? pref->GetRecommendedValue() : nullptr;
+  if (recommended) {
     pref_object->controlled_by =
         settings_private::ControlledBy::CONTROLLED_BY_USER_POLICY;
     pref_object->enforcement =
         settings_private::Enforcement::ENFORCEMENT_RECOMMENDED;
-    pref_object->recommended_value.reset(
-        pref->GetRecommendedValue()->DeepCopy());
+    pref_object->recommended_value.reset(recommended->DeepCopy());
     return pref_object;
   }
 
 #if defined(OS_CHROMEOS)
   if (IsPrefOwnerControlled(name)) {
     // Check for owner controlled after managed checks because if there is a
     // device policy there is no "owner". (In the unlikely case that both
     // situations apply, either badge is potentially relevant, so the order
     // is somewhat arbitrary).
     pref_object->controlled_by =
@@ skipping 271 matching lines @@
       ExtensionPrefValueMapFactory::GetForBrowserContext(profile_)
           ->GetExtensionControllingPref(pref_object.key);
   if (extension_id.empty())
     return nullptr;
 
   return ExtensionRegistry::Get(profile_)->GetExtensionById(
       extension_id, ExtensionRegistry::ENABLED);
 }
 
 }  // namespace extensions