Index: webkit/plugins/npapi/plugin_list_unittest.cc |
=================================================================== |
--- webkit/plugins/npapi/plugin_list_unittest.cc (revision 129385) |
+++ webkit/plugins/npapi/plugin_list_unittest.cc (working copy) |
@@ -37,8 +37,7 @@ |
const char* kFooGroupName = "Foo"; |
const char* kFooName = "Foo Plugin"; |
const PluginGroupDefinition kPluginDefinitions[] = { |
- { kFooIdentifier, kFooGroupName, kFooName, NULL, 0, |
- "http://example.com/foo" }, |
+ { kFooIdentifier, kFooGroupName, kFooName, NULL, 0 }, |
}; |
} // namespace |
Property changes on: webkit/plugins/npapi/plugin_list_unittest.cc |
___________________________________________________________________ |
Deleted: svn:mergeinfo |
Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/npapi/plugin_list_unittest.cc:r3734-4217,4606-5108,5177-5263 |