| 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/utf_string_conversions.h" | 5 #include "base/utf_string_conversions.h" |
| 6 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h" | |
| 7 #include "chrome/browser/content_settings/cookie_settings.h" | 6 #include "chrome/browser/content_settings/cookie_settings.h" |
| 8 #include "chrome/browser/content_settings/host_content_settings_map.h" | 7 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 8 #include "chrome/browser/extensions/api/content_settings/content_settings_api.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" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
| 14 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
| 15 #include "webkit/plugins/npapi/mock_plugin_list.h" | 15 #include "webkit/plugins/npapi/mock_plugin_list.h" |
| 16 | 16 |
| 17 namespace extensions { | 17 namespace extensions { |
| 18 | 18 |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 ContentSettingsGetResourceIdentifiersFunction::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 ContentSettingsGetResourceIdentifiersFunction::SetPluginsForTesting(NULL); |
| 129 } | 129 } |
| 130 | 130 |
| 131 } // namespace extensions | 131 } // namespace extensions |
| OLD | NEW |