Using MIME types in addition to plugin name to differentiate between plugins.

BUG=108962


Review URL: https://chromiumcodereview.appspot.com/11016005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160653 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 4 deletions

diff --git a/chrome/browser/plugins/plugin_finder_unittest.cc b/chrome/browser/plugins/plugin_finder_unittest.cc
index df922a5..fc60576f 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;