chrome/browser/policy/policy_browsertest.cc - Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component.

Side by Side Diff: chrome/browser/policy/policy_browsertest.cc

Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 3 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/notifications/notification_browsertest.cc ('k') | chrome/browser/ui/website_settings/website_settings.cc » ('j') | no next file with comments »

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 <algorithm>	5 #include <algorithm>

6 #include <string>	6 #include <string>

7 #include <vector>	7 #include <vector>

8	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/bind_helpers.h"	10 #include "base/bind_helpers.h"

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
66 #include "chrome/browser/ui/browser_tabstrip.h"	66 #include "chrome/browser/ui/browser_tabstrip.h"

67 #include "chrome/browser/ui/browser_window.h"	67 #include "chrome/browser/ui/browser_window.h"

68 #include "chrome/browser/ui/host_desktop.h"	68 #include "chrome/browser/ui/host_desktop.h"

69 #include "chrome/browser/ui/location_bar/location_bar.h"	69 #include "chrome/browser/ui/location_bar/location_bar.h"

70 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"	70 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"

71 #include "chrome/browser/ui/omnibox/omnibox_view.h"	71 #include "chrome/browser/ui/omnibox/omnibox_view.h"

72 #include "chrome/browser/ui/tabs/tab_strip_model.h"	72 #include "chrome/browser/ui/tabs/tab_strip_model.h"

73 #include "chrome/common/chrome_paths.h"	73 #include "chrome/common/chrome_paths.h"

74 #include "chrome/common/chrome_switches.h"	74 #include "chrome/common/chrome_switches.h"

75 #include "chrome/common/content_settings.h"	75 #include "chrome/common/content_settings.h"

76 #include "chrome/common/content_settings_pattern.h"

77 #include "chrome/common/extensions/extension_constants.h"	76 #include "chrome/common/extensions/extension_constants.h"

78 #include "chrome/common/pref_names.h"	77 #include "chrome/common/pref_names.h"

79 #include "chrome/common/url_constants.h"	78 #include "chrome/common/url_constants.h"

80 #include "chrome/grit/generated_resources.h"	79 #include "chrome/grit/generated_resources.h"

81 #include "chrome/test/base/in_process_browser_test.h"	80 #include "chrome/test/base/in_process_browser_test.h"

82 #include "chrome/test/base/test_switches.h"	81 #include "chrome/test/base/test_switches.h"

83 #include "chrome/test/base/ui_test_utils.h"	82 #include "chrome/test/base/ui_test_utils.h"

	83 #include "components/content_settings/core/common/content_settings_pattern.h"

84 #include "components/infobars/core/infobar.h"	84 #include "components/infobars/core/infobar.h"

85 #include "components/policy/core/browser/browser_policy_connector.h"	85 #include "components/policy/core/browser/browser_policy_connector.h"

86 #include "components/policy/core/common/external_data_fetcher.h"	86 #include "components/policy/core/common/external_data_fetcher.h"

87 #include "components/policy/core/common/mock_configuration_policy_provider.h"	87 #include "components/policy/core/common/mock_configuration_policy_provider.h"

88 #include "components/policy/core/common/policy_map.h"	88 #include "components/policy/core/common/policy_map.h"

89 #include "components/policy/core/common/policy_pref_names.h"	89 #include "components/policy/core/common/policy_pref_names.h"

90 #include "components/policy/core/common/policy_service.h"	90 #include "components/policy/core/common/policy_service.h"

91 #include "components/policy/core/common/policy_service_impl.h"	91 #include "components/policy/core/common/policy_service_impl.h"

92 #include "components/search_engines/template_url.h"	92 #include "components/search_engines/template_url.h"

93 #include "components/search_engines/template_url_service.h"	93 #include "components/search_engines/template_url_service.h"

(...skipping 3123 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
3217 EXPECT_TRUE(content::ExecuteScriptAndExtractBool(	3217 EXPECT_TRUE(content::ExecuteScriptAndExtractBool(

3218 browser2->tab_strip_model()->GetActiveWebContents(),	3218 browser2->tab_strip_model()->GetActiveWebContents(),

3219 "domAutomationController.send(window.showModalDialog !== undefined);",	3219 "domAutomationController.send(window.showModalDialog !== undefined);",

3220 &result));	3220 &result));

3221 EXPECT_TRUE(result);	3221 EXPECT_TRUE(result);

3222 }	3222 }

3223	3223

3224 #endif // !defined(CHROME_OS)	3224 #endif // !defined(CHROME_OS)

3225	3225

3226 } // namespace policy	3226 } // namespace policy

OLD	NEW