Index: chrome/browser/plugins/plugin_finder_unittest.cc |
diff --git a/chrome/browser/plugins/plugin_finder_unittest.cc b/chrome/browser/plugins/plugin_finder_unittest.cc |
index 5afe3d1ae90e5ddd66c89005e7006df317f7fe10..904d1762fdd8e33be629a59b50f1440ee32505a8 100644 |
--- a/chrome/browser/plugins/plugin_finder_unittest.cc |
+++ b/chrome/browser/plugins/plugin_finder_unittest.cc |
@@ -12,16 +12,16 @@ using base::DictionaryValue; |
using base::ListValue; |
TEST(PluginFinderTest, JsonSyntax) { |
- scoped_ptr<DictionaryValue> plugin_list( |
+ scoped_ptr<base::DictionaryValue> plugin_list( |
PluginFinder::LoadBuiltInPluginList()); |
ASSERT_TRUE(plugin_list.get()); |
scoped_ptr<base::Value> version; |
ASSERT_TRUE(plugin_list->Remove("x-version", &version)); |
EXPECT_EQ(base::Value::TYPE_INTEGER, version->GetType()); |
- for (DictionaryValue::Iterator plugin_it(*plugin_list); |
+ for (base::DictionaryValue::Iterator plugin_it(*plugin_list); |
!plugin_it.IsAtEnd(); plugin_it.Advance()) { |
- const DictionaryValue* plugin = NULL; |
+ const base::DictionaryValue* plugin = NULL; |
ASSERT_TRUE(plugin_it.value().GetAsDictionary(&plugin)); |
std::string dummy_str; |
bool dummy_bool; |
@@ -36,29 +36,29 @@ TEST(PluginFinderTest, JsonSyntax) { |
EXPECT_TRUE(plugin->GetBoolean("displayurl", &dummy_bool)); |
if (plugin->HasKey("requires_authorization")) |
EXPECT_TRUE(plugin->GetBoolean("requires_authorization", &dummy_bool)); |
- const ListValue* mime_types = NULL; |
+ const base::ListValue* mime_types = NULL; |
if (plugin->GetList("mime_types", &mime_types)) { |
- for (ListValue::const_iterator mime_type_it = mime_types->begin(); |
+ for (base::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; |
+ const base::ListValue* matching_mime_types = NULL; |
if (plugin->GetList("matching_mime_types", &matching_mime_types)) { |
- for (ListValue::const_iterator it = matching_mime_types->begin(); |
+ for (base::ListValue::const_iterator it = matching_mime_types->begin(); |
it != matching_mime_types->end(); ++it) { |
EXPECT_TRUE((*it)->GetAsString(&dummy_str)); |
} |
} |
- const ListValue* versions = NULL; |
+ const base::ListValue* versions = NULL; |
if (!plugin->GetList("versions", &versions)) |
continue; |
- for (ListValue::const_iterator it = versions->begin(); |
+ for (base::ListValue::const_iterator it = versions->begin(); |
it != versions->end(); ++it) { |
- DictionaryValue* version_dict = NULL; |
+ base::DictionaryValue* version_dict = NULL; |
ASSERT_TRUE((*it)->GetAsDictionary(&version_dict)); |
EXPECT_TRUE(version_dict->GetString("version", &dummy_str)); |
std::string status_str; |