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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/plugins/plugin_finder.h" 5 #include "chrome/browser/plugins/plugin_finder.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/plugins/plugin_metadata.h" 8 #include "chrome/browser/plugins/plugin_metadata.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "webkit/plugins/npapi/plugin_list.h" 10 #include "webkit/plugins/npapi/plugin_list.h"
(...skipping 15 matching lines...) Expand all
26 if (plugin->HasKey("url")) 26 if (plugin->HasKey("url"))
27 EXPECT_TRUE(plugin->GetString("url", &dummy_str)); 27 EXPECT_TRUE(plugin->GetString("url", &dummy_str));
28 EXPECT_TRUE(plugin->GetString("name", &dummy_str)); 28 EXPECT_TRUE(plugin->GetString("name", &dummy_str));
29 if (plugin->HasKey("help_url")) 29 if (plugin->HasKey("help_url"))
30 EXPECT_TRUE(plugin->GetString("help_url", &dummy_str)); 30 EXPECT_TRUE(plugin->GetString("help_url", &dummy_str));
31 if (plugin->HasKey("displayurl")) 31 if (plugin->HasKey("displayurl"))
32 EXPECT_TRUE(plugin->GetBoolean("displayurl", &dummy_bool)); 32 EXPECT_TRUE(plugin->GetBoolean("displayurl", &dummy_bool));
33 if (plugin->HasKey("requires_authorization")) 33 if (plugin->HasKey("requires_authorization"))
34 EXPECT_TRUE(plugin->GetBoolean("requires_authorization", &dummy_bool)); 34 EXPECT_TRUE(plugin->GetBoolean("requires_authorization", &dummy_bool));
35 const ListValue* mime_types = NULL; 35 const ListValue* mime_types = NULL;
36 ASSERT_TRUE(plugin->GetList("mime_types", &mime_types)); 36 if (plugin->GetList("mime_types", &mime_types)) {
37 for (ListValue::const_iterator mime_type_it = mime_types->begin(); 37 for (ListValue::const_iterator mime_type_it = mime_types->begin();
38 mime_type_it != mime_types->end(); ++mime_type_it) { 38 mime_type_it != mime_types->end(); ++mime_type_it) {
39 EXPECT_TRUE((*mime_type_it)->GetAsString(&dummy_str)); 39 EXPECT_TRUE((*mime_type_it)->GetAsString(&dummy_str));
40 }
40 } 41 }
42
43 const ListValue* matching_mime_types = NULL;
44 if (plugin->GetList("matching_mime_types", &matching_mime_types)) {
45 for (ListValue::const_iterator it = matching_mime_types->begin();
46 it != matching_mime_types->end(); ++it) {
47 EXPECT_TRUE((*it)->GetAsString(&dummy_str));
48 }
49 }
50
41 const ListValue* versions = NULL; 51 const ListValue* versions = NULL;
42 if (!plugin->GetList("versions", &versions)) 52 if (!plugin->GetList("versions", &versions))
43 continue; 53 continue;
44 54
45 for (ListValue::const_iterator it = versions->begin(); 55 for (ListValue::const_iterator it = versions->begin();
46 it != versions->end(); ++it) { 56 it != versions->end(); ++it) {
47 DictionaryValue* version_dict = NULL; 57 DictionaryValue* version_dict = NULL;
48 ASSERT_TRUE((*it)->GetAsDictionary(&version_dict)); 58 ASSERT_TRUE((*it)->GetAsDictionary(&version_dict));
49 EXPECT_TRUE(version_dict->GetString("version", &dummy_str)); 59 EXPECT_TRUE(version_dict->GetString("version", &dummy_str));
50 std::string status_str; 60 std::string status_str;
51 EXPECT_TRUE(version_dict->GetString("status", &status_str)); 61 EXPECT_TRUE(version_dict->GetString("status", &status_str));
52 PluginMetadata::SecurityStatus status = 62 PluginMetadata::SecurityStatus status =
53 PluginMetadata::SECURITY_STATUS_UP_TO_DATE; 63 PluginMetadata::SECURITY_STATUS_UP_TO_DATE;
54 EXPECT_TRUE(PluginMetadata::ParseSecurityStatus(status_str, &status)) 64 EXPECT_TRUE(PluginMetadata::ParseSecurityStatus(status_str, &status))
55 << "Invalid security status \"" << status_str << "\""; 65 << "Invalid security status \"" << status_str << "\"";
56 } 66 }
57 } 67 }
58 } 68 }
OLDNEW
« 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