Refactored StringToIntEnumListPolicyHandler to be more general purpose

chrome/browser/policy/configuration_policy_handler_list_factory.cc

 // Copyright 2013 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/policy/configuration_policy_handler_list_factory.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "base/values.h"
@@ skipping 466 matching lines @@
 #endif  // defined(OS_ANDROID)
 
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
   { key::kNativeMessagingUserLevelHosts,
     extensions::pref_names::kNativeMessagingUserLevelHosts,
     base::Value::TYPE_BOOLEAN },
 #endif  // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
 };
 
 #if !defined(OS_IOS)
-// Mapping from extension type names to Manifest::Type.
-StringToIntEnumListPolicyHandler::MappingEntry kExtensionAllowedTypesMap[] = {
-  { "extension", extensions::Manifest::TYPE_EXTENSION },
-  { "theme", extensions::Manifest::TYPE_THEME },
-  { "user_script", extensions::Manifest::TYPE_USER_SCRIPT },
-  { "hosted_app", extensions::Manifest::TYPE_HOSTED_APP },
-  { "legacy_packaged_app", extensions::Manifest::TYPE_LEGACY_PACKAGED_APP },
-  { "platform_app", extensions::Manifest::TYPE_PLATFORM_APP },
-};
+void GetExtensionAllowedTypesMap(
+    ScopedVector<StringMappingListPolicyHandler::MappingEntry>* result) {
+  // Mapping from extension type names to Manifest::Type.
+  result->push_back(new StringMappingListPolicyHandler::MappingEntry(
+      "extension", scoped_ptr<base::Value>(base::Value::CreateIntegerValue(
+          extensions::Manifest::TYPE_EXTENSION))));
+  result->push_back(new StringMappingListPolicyHandler::MappingEntry(
+      "theme", scoped_ptr<base::Value>(base::Value::CreateIntegerValue(
+          extensions::Manifest::TYPE_THEME))));
+  result->push_back(new StringMappingListPolicyHandler::MappingEntry(
+      "user_script", scoped_ptr<base::Value>(base::Value::CreateIntegerValue(
+          extensions::Manifest::TYPE_USER_SCRIPT))));
+  result->push_back(new StringMappingListPolicyHandler::MappingEntry(
+      "hosted_app", scoped_ptr<base::Value>(base::Value::CreateIntegerValue(
+          extensions::Manifest::TYPE_HOSTED_APP))));
+  result->push_back(new StringMappingListPolicyHandler::MappingEntry(
+      "legacy_packaged_app", scoped_ptr<base::Value>(
+          base::Value::CreateIntegerValue(
+              extensions::Manifest::TYPE_LEGACY_PACKAGED_APP))));
+  result->push_back(new StringMappingListPolicyHandler::MappingEntry(
+      "platform_app", scoped_ptr<base::Value>(base::Value::CreateIntegerValue(

[Joao da Silva, 2014/06/18 08:45:26]

CreateIntegerValue is deprecated, use new base::FundamentalValue(n)

+          extensions::Manifest::TYPE_PLATFORM_APP))));
+}
 #endif  // !defined(OS_IOS)
 
 }  // namespace
 
 void PopulatePolicyHandlerParameters(PolicyHandlerParameters* parameters) {
 #if defined(OS_CHROMEOS)
   if (chromeos::UserManager::IsInitialized()) {
     const chromeos::User* user = chromeos::UserManager::Get()->GetActiveUser();
     if (user)
       parameters->user_id_hash = user->username_hash();
@@ skipping 47 matching lines @@
           key::kExtensionInstallBlacklist,
           extensions::pref_names::kInstallDenyList,
           true)));
   handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
       new extensions::ExtensionInstallForcelistPolicyHandler()));
   handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
       new extensions::ExtensionURLPatternListPolicyHandler(
           key::kExtensionInstallSources,
           extensions::pref_names::kAllowedInstallSites)));
   handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
-      new StringToIntEnumListPolicyHandler(
+      new StringMappingListPolicyHandler(
           key::kExtensionAllowedTypes,
           extensions::pref_names::kAllowedTypes,
-          kExtensionAllowedTypesMap,
-          kExtensionAllowedTypesMap + arraysize(kExtensionAllowedTypesMap))));
+          base::Bind(GetExtensionAllowedTypesMap))));
 #endif  // !defined(OS_IOS)
 
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
   handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
       new DiskCacheDirPolicyHandler()));
 
   handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
       new extensions::NativeMessagingHostListPolicyHandler(
           key::kNativeMessagingWhitelist,
           extensions::pref_names::kNativeMessagingWhitelist,
@@ skipping 164 matching lines @@
   handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
       new ExternalDataPolicyHandler(key::kUserAvatarImage)));
   handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
       new ExternalDataPolicyHandler(key::kWallpaperImage)));
 #endif  // defined(OS_CHROMEOS)
 
   return handlers.Pass();
 }
 
 }  // namespace policy