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

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

Issue 11348046: Add versioning to PluginFinder metadata. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: divx Created 7 years, 10 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 | Annotate | Revision Log
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"
11 11
12 using base::DictionaryValue; 12 using base::DictionaryValue;
13 using base::ListValue;
13 using webkit::npapi::PluginList; 14 using webkit::npapi::PluginList;
14 15
15 TEST(PluginFinderTest, JsonSyntax) { 16 TEST(PluginFinderTest, JsonSyntax) {
16 scoped_ptr<DictionaryValue> plugin_list(PluginFinder::LoadPluginList()); 17 scoped_ptr<DictionaryValue> plugin_list(
18 PluginFinder::LoadBuiltInPluginList());
17 ASSERT_TRUE(plugin_list.get()); 19 ASSERT_TRUE(plugin_list.get());
20 base::Value* version = NULL;
21 if (plugin_list->Remove("x-version", &version))
Chris Evans 2013/02/08 19:25:23 Nit: Now that we are versioning our files, I think
Bernhard Bauer 2013/02/11 09:58:19 Done.
22 EXPECT_EQ(base::Value::TYPE_INTEGER, version->GetType());
23
18 for (DictionaryValue::Iterator plugin_it(*plugin_list); 24 for (DictionaryValue::Iterator plugin_it(*plugin_list);
19 plugin_it.HasNext(); plugin_it.Advance()) { 25 plugin_it.HasNext(); plugin_it.Advance()) {
20 const DictionaryValue* plugin = NULL; 26 const DictionaryValue* plugin = NULL;
21 ASSERT_TRUE(plugin_it.value().GetAsDictionary(&plugin)); 27 ASSERT_TRUE(plugin_it.value().GetAsDictionary(&plugin));
22 std::string dummy_str; 28 std::string dummy_str;
23 bool dummy_bool; 29 bool dummy_bool;
24 if (plugin->HasKey("lang")) 30 if (plugin->HasKey("lang"))
25 EXPECT_TRUE(plugin->GetString("lang", &dummy_str)); 31 EXPECT_TRUE(plugin->GetString("lang", &dummy_str));
26 if (plugin->HasKey("url")) 32 if (plugin->HasKey("url"))
27 EXPECT_TRUE(plugin->GetString("url", &dummy_str)); 33 EXPECT_TRUE(plugin->GetString("url", &dummy_str));
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 EXPECT_TRUE(version_dict->GetString("version", &dummy_str)); 65 EXPECT_TRUE(version_dict->GetString("version", &dummy_str));
60 std::string status_str; 66 std::string status_str;
61 EXPECT_TRUE(version_dict->GetString("status", &status_str)); 67 EXPECT_TRUE(version_dict->GetString("status", &status_str));
62 PluginMetadata::SecurityStatus status = 68 PluginMetadata::SecurityStatus status =
63 PluginMetadata::SECURITY_STATUS_UP_TO_DATE; 69 PluginMetadata::SECURITY_STATUS_UP_TO_DATE;
64 EXPECT_TRUE(PluginMetadata::ParseSecurityStatus(status_str, &status)) 70 EXPECT_TRUE(PluginMetadata::ParseSecurityStatus(status_str, &status))
65 << "Invalid security status \"" << status_str << "\""; 71 << "Invalid security status \"" << status_str << "\"";
66 } 72 }
67 } 73 }
68 } 74 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698