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

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

Issue 10918174: Remove PluginGroup (Closed) Base URL: http://git.chromium.org/chromium/src.git@remove_async_plugin_finder
Patch Set: fix conflicts Created 8 years, 2 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 "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 107
108 webkit::npapi::MockPluginList plugin_list(NULL, 0); 108 webkit::npapi::MockPluginList plugin_list;
109 plugin_list.AddPluginToLoad( 109 plugin_list.AddPluginToLoad(
110 webkit::WebPluginInfo(ASCIIToUTF16(kFooName), 110 webkit::WebPluginInfo(ASCIIToUTF16(kFooName),
111 FilePath(kFooPath), 111 FilePath(kFooPath),
112 ASCIIToUTF16("1.2.3"), 112 ASCIIToUTF16("1.2.3"),
113 ASCIIToUTF16("foo"))); 113 ASCIIToUTF16("foo")));
114 plugin_list.AddPluginToLoad( 114 plugin_list.AddPluginToLoad(
115 webkit::WebPluginInfo(ASCIIToUTF16(kBarName), 115 webkit::WebPluginInfo(ASCIIToUTF16(kBarName),
116 FilePath(kBarPath), 116 FilePath(kBarPath),
117 ASCIIToUTF16("2.3.4"), 117 ASCIIToUTF16("2.3.4"),
118 ASCIIToUTF16("bar"))); 118 ASCIIToUTF16("bar")));
119 119
120 std::vector<webkit::WebPluginInfo> plugins; 120 std::vector<webkit::WebPluginInfo> plugins;
121 plugin_list.GetPlugins(&plugins); 121 plugin_list.GetPlugins(&plugins);
122 122
123 GetResourceIdentifiersFunction::SetPluginsForTesting(&plugins); 123 GetResourceIdentifiersFunction::SetPluginsForTesting(&plugins);
124 124
125 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers")) 125 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))
126 << message_; 126 << message_;
127 127
128 GetResourceIdentifiersFunction::SetPluginsForTesting(NULL); 128 GetResourceIdentifiersFunction::SetPluginsForTesting(NULL);
129 } 129 }
130 130
131 } // namespace extensions 131 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698