| Index: chrome/browser/configuration_policy_pref_store.cc
|
| diff --git a/chrome/browser/configuration_policy_pref_store.cc b/chrome/browser/configuration_policy_pref_store.cc
|
| index 94b0fad3007afab97ca788506cd2ec70f52a5985..a59fc25af075fa48cb88db049e8001890cc646f6 100644
|
| --- a/chrome/browser/configuration_policy_pref_store.cc
|
| +++ b/chrome/browser/configuration_policy_pref_store.cc
|
| @@ -286,7 +286,7 @@ bool ConfigurationPolicyPrefStore::ApplyPluginPolicy(PolicyType policy,
|
| Value* value) {
|
| if (policy == kPolicyDisabledPlugins) {
|
| string16 plugin_list;
|
| - if (value->GetAsUTF16(&plugin_list)) {
|
| + if (value->GetAsString(&plugin_list)) {
|
| std::vector<string16> plugin_names;
|
| // Change commas into tabs so that we can change escaped
|
| // tabs back into commas, leaving non-escaped commas as tabs
|
| @@ -303,7 +303,7 @@ bool ConfigurationPolicyPrefStore::ApplyPluginPolicy(PolicyType policy,
|
| for (std::vector<string16>::const_iterator i(plugin_names.begin());
|
| i != plugin_names.end(); ++i) {
|
| if (!i->empty()) {
|
| - list->Append(Value::CreateStringValueFromUTF16(*i));
|
| + list->Append(Value::CreateStringValue(*i));
|
| added_plugin = true;
|
| }
|
| }
|
|
|