chrome/browser/extensions/api/content_settings/content_settings_apitest.cc - Issue 10381097: Move content settings extension API to content_settings dir.

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

Issue 10381097: Move content settings extension API to content_settings dir. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: fixed conflict Created 8 years, 7 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

« no previous file with comments | « chrome/browser/extensions/api/content_settings/content_settings_api_constants.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_helpers.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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"

6 #include "chrome/browser/content_settings/cookie_settings.h"	7 #include "chrome/browser/content_settings/cookie_settings.h"

7 #include "chrome/browser/content_settings/host_content_settings_map.h"	8 #include "chrome/browser/content_settings/host_content_settings_map.h"

8 #include "chrome/browser/extensions/extension_apitest.h"	9 #include "chrome/browser/extensions/extension_apitest.h"

9 #include "chrome/browser/extensions/extension_content_settings_api.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 {

	18

17 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) {	19 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) {

18 CommandLine::ForCurrentProcess()->AppendSwitch(	20 CommandLine::ForCurrentProcess()->AppendSwitch(

19 switches::kEnableExperimentalExtensionApis);	21 switches::kEnableExperimentalExtensionApis);

20	22

21 EXPECT_TRUE(RunExtensionTest("content_settings/standard")) << message_;	23 EXPECT_TRUE(RunExtensionTest("content_settings/standard")) << message_;

22	24

23 HostContentSettingsMap* map =	25 HostContentSettingsMap* map =

24 browser()->profile()->GetHostContentSettingsMap();	26 browser()->profile()->GetHostContentSettingsMap();

25 CookieSettings* cookie_settings =	27 CookieSettings* cookie_settings =

26 CookieSettings::Factory::GetForProfile(browser()->profile());	28 CookieSettings::Factory::GetForProfile(browser()->profile());

(...skipping 95 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
122 std::vector<webkit::npapi::PluginGroup> groups;	124 std::vector<webkit::npapi::PluginGroup> groups;

123 plugin_list.GetPluginGroups(true, &groups);	125 plugin_list.GetPluginGroups(true, &groups);

124	126

125 GetResourceIdentifiersFunction::SetPluginGroupsForTesting(&groups);	127 GetResourceIdentifiersFunction::SetPluginGroupsForTesting(&groups);

126	128

127 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))	129 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))

128 << message_;	130 << message_;

129	131

130 GetResourceIdentifiersFunction::SetPluginGroupsForTesting(NULL);	132 GetResourceIdentifiersFunction::SetPluginGroupsForTesting(NULL);

131 }	133 }

	134

	135 } // namespace extensions

OLD	NEW