OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/content_settings/host_content_settings_map.h" | 6 #include "chrome/browser/content_settings/host_content_settings_map.h" |
7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
8 #include "chrome/browser/extensions/extension_content_settings_api.h" | 8 #include "chrome/browser/extensions/extension_content_settings_api.h" |
9 #include "chrome/browser/prefs/pref_service.h" | 9 #include "chrome/browser/prefs/pref_service.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
11 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
12 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
13 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
| 14 #include "content/browser/plugin_service.h" |
14 #include "webkit/plugins/npapi/mock_plugin_list.h" | 15 #include "webkit/plugins/npapi/mock_plugin_list.h" |
15 | 16 |
16 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) { | 17 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) { |
17 CommandLine::ForCurrentProcess()->AppendSwitch( | 18 CommandLine::ForCurrentProcess()->AppendSwitch( |
18 switches::kEnableExperimentalExtensionApis); | 19 switches::kEnableExperimentalExtensionApis); |
19 | 20 |
20 EXPECT_TRUE(RunExtensionTest("content_settings/standard")) << message_; | 21 EXPECT_TRUE(RunExtensionTest("content_settings/standard")) << message_; |
21 | 22 |
22 HostContentSettingsMap* map = | 23 HostContentSettingsMap* map = |
23 browser()->profile()->GetHostContentSettingsMap(); | 24 browser()->profile()->GetHostContentSettingsMap(); |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 plugin_list.AddPluginToLoad( | 111 plugin_list.AddPluginToLoad( |
111 webkit::WebPluginInfo(ASCIIToUTF16(kFooName), | 112 webkit::WebPluginInfo(ASCIIToUTF16(kFooName), |
112 FilePath(kFooPath), | 113 FilePath(kFooPath), |
113 ASCIIToUTF16("1.2.3"), | 114 ASCIIToUTF16("1.2.3"), |
114 ASCIIToUTF16("foo"))); | 115 ASCIIToUTF16("foo"))); |
115 plugin_list.AddPluginToLoad( | 116 plugin_list.AddPluginToLoad( |
116 webkit::WebPluginInfo(ASCIIToUTF16(kBarName), | 117 webkit::WebPluginInfo(ASCIIToUTF16(kBarName), |
117 FilePath(kBarPath), | 118 FilePath(kBarPath), |
118 ASCIIToUTF16("2.3.4"), | 119 ASCIIToUTF16("2.3.4"), |
119 ASCIIToUTF16("bar"))); | 120 ASCIIToUTF16("bar"))); |
120 GetResourceIdentifiersFunction::SetPluginListForTesting(&plugin_list); | 121 |
| 122 PluginService::GetInstance()->SetPluginListForTesting(&plugin_list); |
121 | 123 |
122 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers")) | 124 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers")) |
123 << message_; | 125 << message_; |
124 | 126 |
125 GetResourceIdentifiersFunction::SetPluginListForTesting(NULL); | 127 PluginService::GetInstance()->SetPluginListForTesting(NULL); |
126 } | 128 } |
OLD | NEW |