Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2414)

Unified Diff: chrome/browser/plugins/plugin_finder_unittest.cc

Issue 11016005: Using MIME types in addition to plugin name to differentiate between plugins. (Closed) Base URL: http://git.chromium.org/chromium/src.git@5_plugins_resource_service
Patch Set: fixed error Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/plugins/plugin_finder.cc ('k') | chrome/browser/plugins/plugin_metadata.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugins/plugin_finder_unittest.cc
diff --git a/chrome/browser/plugins/plugin_finder_unittest.cc b/chrome/browser/plugins/plugin_finder_unittest.cc
index df922a53f2e059133ad179aa810542fbe43001f3..fc60576f3bcb72dc93f8e7285ad3c1d6d89697ce 100644
--- a/chrome/browser/plugins/plugin_finder_unittest.cc
+++ b/chrome/browser/plugins/plugin_finder_unittest.cc
@@ -33,11 +33,21 @@ TEST(PluginFinderTest, JsonSyntax) {
if (plugin->HasKey("requires_authorization"))
EXPECT_TRUE(plugin->GetBoolean("requires_authorization", &dummy_bool));
const ListValue* mime_types = NULL;
- ASSERT_TRUE(plugin->GetList("mime_types", &mime_types));
- for (ListValue::const_iterator mime_type_it = mime_types->begin();
- mime_type_it != mime_types->end(); ++mime_type_it) {
- EXPECT_TRUE((*mime_type_it)->GetAsString(&dummy_str));
+ if (plugin->GetList("mime_types", &mime_types)) {
+ for (ListValue::const_iterator mime_type_it = mime_types->begin();
+ mime_type_it != mime_types->end(); ++mime_type_it) {
+ EXPECT_TRUE((*mime_type_it)->GetAsString(&dummy_str));
+ }
}
+
+ const ListValue* matching_mime_types = NULL;
+ if (plugin->GetList("matching_mime_types", &matching_mime_types)) {
+ for (ListValue::const_iterator it = matching_mime_types->begin();
+ it != matching_mime_types->end(); ++it) {
+ EXPECT_TRUE((*it)->GetAsString(&dummy_str));
+ }
+ }
+
const ListValue* versions = NULL;
if (!plugin->GetList("versions", &versions))
continue;
« no previous file with comments | « chrome/browser/plugins/plugin_finder.cc ('k') | chrome/browser/plugins/plugin_metadata.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698