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 "base/prefs/pref_service.h" | 5 #include "base/prefs/pref_service.h" |
6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
7 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
9 #include "chrome/browser/content_settings/cookie_settings.h" | 9 #include "chrome/browser/content_settings/cookie_settings.h" |
10 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h" | 10 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h" |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 CheckContentSettingsDefault(); | 207 CheckContentSettingsDefault(); |
208 } | 208 } |
209 | 209 |
210 // Flaky on the trybots. See http://crbug.com/96725. | 210 // Flaky on the trybots. See http://crbug.com/96725. |
211 IN_PROC_BROWSER_TEST_F(ExtensionContentSettingsApiTest, | 211 IN_PROC_BROWSER_TEST_F(ExtensionContentSettingsApiTest, |
212 DISABLED_GetResourceIdentifiers) { | 212 DISABLED_GetResourceIdentifiers) { |
213 base::FilePath::CharType kFooPath[] = | 213 base::FilePath::CharType kFooPath[] = |
214 FILE_PATH_LITERAL("/plugins/foo.plugin"); | 214 FILE_PATH_LITERAL("/plugins/foo.plugin"); |
215 base::FilePath::CharType kBarPath[] = | 215 base::FilePath::CharType kBarPath[] = |
216 FILE_PATH_LITERAL("/plugins/bar.plugin"); | 216 FILE_PATH_LITERAL("/plugins/bar.plugin"); |
217 const char* kFooName = "Foo Plugin"; | 217 const char kFooName[] = "Foo Plugin"; |
218 const char* kBarName = "Bar Plugin"; | 218 const char kBarName[] = "Bar Plugin"; |
219 | 219 |
220 content::PluginService::GetInstance()->RegisterInternalPlugin( | 220 content::PluginService::GetInstance()->RegisterInternalPlugin( |
221 content::WebPluginInfo(base::ASCIIToUTF16(kFooName), | 221 content::WebPluginInfo(base::ASCIIToUTF16(kFooName), |
222 base::FilePath(kFooPath), | 222 base::FilePath(kFooPath), |
223 base::ASCIIToUTF16("1.2.3"), | 223 base::ASCIIToUTF16("1.2.3"), |
224 base::ASCIIToUTF16("foo")), | 224 base::ASCIIToUTF16("foo")), |
225 false); | 225 false); |
226 content::PluginService::GetInstance()->RegisterInternalPlugin( | 226 content::PluginService::GetInstance()->RegisterInternalPlugin( |
227 content::WebPluginInfo(base::ASCIIToUTF16(kBarName), | 227 content::WebPluginInfo(base::ASCIIToUTF16(kBarName), |
228 base::FilePath(kBarPath), | 228 base::FilePath(kBarPath), |
229 base::ASCIIToUTF16("2.3.4"), | 229 base::ASCIIToUTF16("2.3.4"), |
230 base::ASCIIToUTF16("bar")), | 230 base::ASCIIToUTF16("bar")), |
231 false); | 231 false); |
232 | 232 |
233 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers")) | 233 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers")) |
234 << message_; | 234 << message_; |
235 } | 235 } |
236 | 236 |
237 } // namespace extensions | 237 } // namespace extensions |
OLD | NEW |