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

Side by Side Diff: chrome/browser/plugins/plugin_finder_unittest.cc

Issue 2816513002: Revert of Change base::Value::ListStorage to std::vector<base::Value> (Closed)
Patch Set: Created 3 years, 8 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_prefs.cc » ('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 10
(...skipping 25 matching lines...) Expand all
36 if (plugin->HasKey("displayurl")) { 36 if (plugin->HasKey("displayurl")) {
37 EXPECT_TRUE(plugin->GetBoolean("displayurl", &display_url)); 37 EXPECT_TRUE(plugin->GetBoolean("displayurl", &display_url));
38 EXPECT_TRUE(display_url); 38 EXPECT_TRUE(display_url);
39 } 39 }
40 if (plugin->HasKey("requires_authorization")) 40 if (plugin->HasKey("requires_authorization"))
41 EXPECT_TRUE(plugin->GetBoolean("requires_authorization", &dummy_bool)); 41 EXPECT_TRUE(plugin->GetBoolean("requires_authorization", &dummy_bool));
42 const base::ListValue* mime_types = NULL; 42 const base::ListValue* mime_types = NULL;
43 if (plugin->GetList("mime_types", &mime_types)) { 43 if (plugin->GetList("mime_types", &mime_types)) {
44 for (base::ListValue::const_iterator mime_type_it = mime_types->begin(); 44 for (base::ListValue::const_iterator mime_type_it = mime_types->begin();
45 mime_type_it != mime_types->end(); ++mime_type_it) { 45 mime_type_it != mime_types->end(); ++mime_type_it) {
46 EXPECT_TRUE(mime_type_it->GetAsString(&dummy_str)); 46 EXPECT_TRUE((*mime_type_it)->GetAsString(&dummy_str));
47 } 47 }
48 } 48 }
49 49
50 const base::ListValue* matching_mime_types = NULL; 50 const base::ListValue* matching_mime_types = NULL;
51 if (plugin->GetList("matching_mime_types", &matching_mime_types)) { 51 if (plugin->GetList("matching_mime_types", &matching_mime_types)) {
52 for (base::ListValue::const_iterator it = matching_mime_types->begin(); 52 for (base::ListValue::const_iterator it = matching_mime_types->begin();
53 it != matching_mime_types->end(); ++it) { 53 it != matching_mime_types->end(); ++it) {
54 EXPECT_TRUE(it->GetAsString(&dummy_str)); 54 EXPECT_TRUE((*it)->GetAsString(&dummy_str));
55 } 55 }
56 } 56 }
57 57
58 const base::ListValue* versions = NULL; 58 const base::ListValue* versions = NULL;
59 if (!plugin->GetList("versions", &versions)) 59 if (!plugin->GetList("versions", &versions))
60 continue; 60 continue;
61 61
62 for (base::ListValue::const_iterator it = versions->begin(); 62 for (base::ListValue::const_iterator it = versions->begin();
63 it != versions->end(); ++it) { 63 it != versions->end(); ++it) {
64 const base::DictionaryValue* version_dict = NULL; 64 base::DictionaryValue* version_dict = NULL;
65 ASSERT_TRUE(it->GetAsDictionary(&version_dict)); 65 ASSERT_TRUE((*it)->GetAsDictionary(&version_dict));
66 EXPECT_TRUE(version_dict->GetString("version", &dummy_str)); 66 EXPECT_TRUE(version_dict->GetString("version", &dummy_str));
67 std::string status_str; 67 std::string status_str;
68 EXPECT_TRUE(version_dict->GetString("status", &status_str)); 68 EXPECT_TRUE(version_dict->GetString("status", &status_str));
69 PluginMetadata::SecurityStatus status = 69 PluginMetadata::SecurityStatus status =
70 PluginMetadata::SECURITY_STATUS_UP_TO_DATE; 70 PluginMetadata::SECURITY_STATUS_UP_TO_DATE;
71 EXPECT_TRUE(PluginMetadata::ParseSecurityStatus(status_str, &status)) 71 EXPECT_TRUE(PluginMetadata::ParseSecurityStatus(status_str, &status))
72 << "Invalid security status \"" << status_str << "\""; 72 << "Invalid security status \"" << status_str << "\"";
73 } 73 }
74 } 74 }
75 } 75 }
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugin_finder.cc ('k') | chrome/browser/plugins/plugin_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698