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