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

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

Issue 10933044: Move chrome/browser/plugin_* to chrome/browser/plugins/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@remove_plugin_group
Patch Set: . Created 8 years, 3 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
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/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/plugin_installer.h" 8 #include "chrome/browser/plugins/plugin_installer.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 webkit::npapi::PluginGroup; 13 using webkit::npapi::PluginGroup;
14 using webkit::npapi::PluginList; 14 using webkit::npapi::PluginList;
15 15
16 TEST(PluginFinderTest, JsonSyntax) { 16 TEST(PluginFinderTest, JsonSyntax) {
17 scoped_ptr<DictionaryValue> plugin_list(PluginFinder::LoadPluginList()); 17 scoped_ptr<DictionaryValue> plugin_list(PluginFinder::LoadPluginList());
18 ASSERT_TRUE(plugin_list.get()); 18 ASSERT_TRUE(plugin_list.get());
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 EXPECT_TRUE(version_dict->GetString("version", &dummy_str)); 50 EXPECT_TRUE(version_dict->GetString("version", &dummy_str));
51 std::string status_str; 51 std::string status_str;
52 EXPECT_TRUE(version_dict->GetString("status", &status_str)); 52 EXPECT_TRUE(version_dict->GetString("status", &status_str));
53 PluginInstaller::SecurityStatus status = 53 PluginInstaller::SecurityStatus status =
54 PluginInstaller::SECURITY_STATUS_UP_TO_DATE; 54 PluginInstaller::SECURITY_STATUS_UP_TO_DATE;
55 EXPECT_TRUE(PluginInstaller::ParseSecurityStatus(status_str, &status)) 55 EXPECT_TRUE(PluginInstaller::ParseSecurityStatus(status_str, &status))
56 << "Invalid security status \"" << status_str << "\""; 56 << "Invalid security status \"" << status_str << "\"";
57 } 57 }
58 } 58 }
59 } 59 }
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugin_finder.cc ('k') | chrome/browser/plugins/plugin_infobar_delegates.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698