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

Side by Side Diff: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

Issue 10263022: Move version metadata from PluginGroup into PluginInstaller. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 7 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
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/plugin_finder.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 "base/utf_string_conversions.h" 5 #include "base/utf_string_conversions.h"
6 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h" 6 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
7 #include "chrome/browser/content_settings/cookie_settings.h" 7 #include "chrome/browser/content_settings/cookie_settings.h"
8 #include "chrome/browser/content_settings/host_content_settings_map.h" 8 #include "chrome/browser/content_settings/host_content_settings_map.h"
9 #include "chrome/browser/extensions/extension_apitest.h" 9 #include "chrome/browser/extensions/extension_apitest.h"
10 #include "chrome/browser/prefs/pref_service.h" 10 #include "chrome/browser/prefs/pref_service.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, 98 IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
99 DISABLED_ContentSettingsGetResourceIdentifiers) { 99 DISABLED_ContentSettingsGetResourceIdentifiers) {
100 CommandLine::ForCurrentProcess()->AppendSwitch( 100 CommandLine::ForCurrentProcess()->AppendSwitch(
101 switches::kEnableExperimentalExtensionApis); 101 switches::kEnableExperimentalExtensionApis);
102 102
103 FilePath::CharType kFooPath[] = FILE_PATH_LITERAL("/plugins/foo.plugin"); 103 FilePath::CharType kFooPath[] = FILE_PATH_LITERAL("/plugins/foo.plugin");
104 FilePath::CharType kBarPath[] = FILE_PATH_LITERAL("/plugins/bar.plugin"); 104 FilePath::CharType kBarPath[] = FILE_PATH_LITERAL("/plugins/bar.plugin");
105 const char* kFooName = "Foo Plugin"; 105 const char* kFooName = "Foo Plugin";
106 const char* kBarName = "Bar Plugin"; 106 const char* kBarName = "Bar Plugin";
107 const webkit::npapi::PluginGroupDefinition kPluginDefinitions[] = { 107 const webkit::npapi::PluginGroupDefinition kPluginDefinitions[] = {
108 { "foo", "Foo", kFooName, NULL, 0 }, 108 { "foo", "Foo", kFooName },
109 }; 109 };
110 110
111 webkit::npapi::MockPluginList plugin_list(kPluginDefinitions, 111 webkit::npapi::MockPluginList plugin_list(kPluginDefinitions,
112 arraysize(kPluginDefinitions)); 112 arraysize(kPluginDefinitions));
113 plugin_list.AddPluginToLoad( 113 plugin_list.AddPluginToLoad(
114 webkit::WebPluginInfo(ASCIIToUTF16(kFooName), 114 webkit::WebPluginInfo(ASCIIToUTF16(kFooName),
115 FilePath(kFooPath), 115 FilePath(kFooPath),
116 ASCIIToUTF16("1.2.3"), 116 ASCIIToUTF16("1.2.3"),
117 ASCIIToUTF16("foo"))); 117 ASCIIToUTF16("foo")));
118 plugin_list.AddPluginToLoad( 118 plugin_list.AddPluginToLoad(
119 webkit::WebPluginInfo(ASCIIToUTF16(kBarName), 119 webkit::WebPluginInfo(ASCIIToUTF16(kBarName),
120 FilePath(kBarPath), 120 FilePath(kBarPath),
121 ASCIIToUTF16("2.3.4"), 121 ASCIIToUTF16("2.3.4"),
122 ASCIIToUTF16("bar"))); 122 ASCIIToUTF16("bar")));
123 123
124 std::vector<webkit::npapi::PluginGroup> groups; 124 std::vector<webkit::npapi::PluginGroup> groups;
125 plugin_list.GetPluginGroups(true, &groups); 125 plugin_list.GetPluginGroups(true, &groups);
126 126
127 GetResourceIdentifiersFunction::SetPluginGroupsForTesting(&groups); 127 GetResourceIdentifiersFunction::SetPluginGroupsForTesting(&groups);
128 128
129 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers")) 129 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))
130 << message_; 130 << message_;
131 131
132 GetResourceIdentifiersFunction::SetPluginGroupsForTesting(NULL); 132 GetResourceIdentifiersFunction::SetPluginGroupsForTesting(NULL);
133 } 133 }
134 134
135 } // namespace extensions 135 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/plugin_finder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698