| OLD | NEW |
| 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" | |
| 11 | 10 |
| 12 using base::DictionaryValue; | 11 using base::DictionaryValue; |
| 13 using base::ListValue; | 12 using base::ListValue; |
| 14 using webkit::npapi::PluginList; | |
| 15 | 13 |
| 16 TEST(PluginFinderTest, JsonSyntax) { | 14 TEST(PluginFinderTest, JsonSyntax) { |
| 17 scoped_ptr<DictionaryValue> plugin_list( | 15 scoped_ptr<DictionaryValue> plugin_list( |
| 18 PluginFinder::LoadBuiltInPluginList()); | 16 PluginFinder::LoadBuiltInPluginList()); |
| 19 ASSERT_TRUE(plugin_list.get()); | 17 ASSERT_TRUE(plugin_list.get()); |
| 20 base::Value* version = NULL; | 18 base::Value* version = NULL; |
| 21 ASSERT_TRUE(plugin_list->Remove("x-version", &version)); | 19 ASSERT_TRUE(plugin_list->Remove("x-version", &version)); |
| 22 EXPECT_EQ(base::Value::TYPE_INTEGER, version->GetType()); | 20 EXPECT_EQ(base::Value::TYPE_INTEGER, version->GetType()); |
| 23 | 21 |
| 24 for (DictionaryValue::Iterator plugin_it(*plugin_list); | 22 for (DictionaryValue::Iterator plugin_it(*plugin_list); |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 EXPECT_TRUE(version_dict->GetString("version", &dummy_str)); | 63 EXPECT_TRUE(version_dict->GetString("version", &dummy_str)); |
| 66 std::string status_str; | 64 std::string status_str; |
| 67 EXPECT_TRUE(version_dict->GetString("status", &status_str)); | 65 EXPECT_TRUE(version_dict->GetString("status", &status_str)); |
| 68 PluginMetadata::SecurityStatus status = | 66 PluginMetadata::SecurityStatus status = |
| 69 PluginMetadata::SECURITY_STATUS_UP_TO_DATE; | 67 PluginMetadata::SECURITY_STATUS_UP_TO_DATE; |
| 70 EXPECT_TRUE(PluginMetadata::ParseSecurityStatus(status_str, &status)) | 68 EXPECT_TRUE(PluginMetadata::ParseSecurityStatus(status_str, &status)) |
| 71 << "Invalid security status \"" << status_str << "\""; | 69 << "Invalid security status \"" << status_str << "\""; |
| 72 } | 70 } |
| 73 } | 71 } |
| 74 } | 72 } |
| OLD | NEW |