MD Settings: add more extension controlled pref handling.

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 @@
         settings_private::ControlledBy::CONTROLLED_BY_OWNER;
     pref_object->enforcement =
         settings_private::Enforcement::ENFORCEMENT_ENFORCED;
     pref_object->controlled_by_name.reset(new std::string(
         user_manager::UserManager::Get()->GetOwnerAccountId().GetUserEmail()));
     return pref_object;
   }
 #endif
 
   const Extension* extension = GetExtensionControllingPref(*pref_object);
+
   if (extension) {
     pref_object->controlled_by =
         settings_private::ControlledBy::CONTROLLED_BY_EXTENSION;
     pref_object->enforcement =
         settings_private::Enforcement::ENFORCEMENT_ENFORCED;
     pref_object->extension_id.reset(new std::string(extension->id()));
     pref_object->controlled_by_name.reset(new std::string(extension->name()));
     bool can_be_disabled = !ExtensionSystem::Get(profile_)->management_policy()
         ->MustRemainEnabled(extension, nullptr);
     pref_object->extension_can_be_disabled.reset(new bool(can_be_disabled));
@@ skipping 240 matching lines @@
 
   if (pref_object.key == ::prefs::kURLsToRestoreOnStartup)
     return GetExtensionOverridingStartupPages(profile_);
 
   if (pref_object.key == ::prefs::kDefaultSearchProviderEnabled)
     return GetExtensionOverridingSearchEngine(profile_);
 
   if (pref_object.key == proxy_config::prefs::kProxy)
     return GetExtensionOverridingProxy(profile_);
 
-  return nullptr;
+  // If it's none of the above, attempt a more general strategy.
+  std::string extension_id =
+      ExtensionPrefValueMapFactory::GetForBrowserContext(profile_)
+          ->GetExtensionControllingPref(pref_object.key);

[Dan Beam, 2017/02/28 17:52:45]

if (extension_id.empty())
  return nullptr;

[scottchen, 2017/02/28 18:56:14]

Done.

+  return ExtensionRegistry::Get(profile_)->
+      GetExtensionById(extension_id, ExtensionRegistry::ENABLED);
 }
 
 }  // namespace extensions