| Index: chrome/browser/plugin_exceptions_table_model_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/plugin_exceptions_table_model_unittest.cc (revision 101271)
|
| +++ chrome/browser/plugin_exceptions_table_model_unittest.cc (working copy)
|
| @@ -93,6 +93,8 @@
|
| webkit::WebPluginInfo foo_plugin;
|
| foo_plugin.path = FilePath(FILE_PATH_LITERAL("a-foo"));
|
| foo_plugin.name = ASCIIToUTF16("FooPlugin");
|
| + foo_plugin.enabled =
|
| + webkit::WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED;
|
| scoped_ptr<webkit::npapi::PluginGroup> foo_group(
|
| webkit::npapi::PluginGroup::FromWebPluginInfo(foo_plugin));
|
| plugins.push_back(*foo_group);
|
| @@ -100,6 +102,8 @@
|
| webkit::WebPluginInfo bar_plugin;
|
| bar_plugin.path = FilePath(FILE_PATH_LITERAL("b-bar"));
|
| bar_plugin.name = ASCIIToUTF16("BarPlugin");
|
| + bar_plugin.enabled =
|
| + webkit::WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED;
|
| scoped_ptr<webkit::npapi::PluginGroup> bar_group(
|
| webkit::npapi::PluginGroup::FromWebPluginInfo(bar_plugin));
|
| plugins.push_back(*bar_group);
|
|
|
| Property changes on: chrome/browser/plugin_exceptions_table_model_unittest.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|