Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

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

Issue 541813002: Componentize chrome/common/content_settings files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: GN fix 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
OLDNEW
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 #include "chrome/browser/ui/browser_list.h" 65 #include "chrome/browser/ui/browser_list.h"
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"
76 #include "chrome/common/extensions/extension_constants.h" 75 #include "chrome/common/extensions/extension_constants.h"
77 #include "chrome/common/pref_names.h" 76 #include "chrome/common/pref_names.h"
78 #include "chrome/common/url_constants.h" 77 #include "chrome/common/url_constants.h"
79 #include "chrome/grit/generated_resources.h" 78 #include "chrome/grit/generated_resources.h"
80 #include "chrome/test/base/in_process_browser_test.h" 79 #include "chrome/test/base/in_process_browser_test.h"
81 #include "chrome/test/base/test_switches.h" 80 #include "chrome/test/base/test_switches.h"
82 #include "chrome/test/base/ui_test_utils.h" 81 #include "chrome/test/base/ui_test_utils.h"
82 #include "components/content_settings/core/common/content_settings.h"
83 #include "components/content_settings/core/common/content_settings_pattern.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"
(...skipping 3133 matching lines...) Expand 10 before | Expand all | Expand 10 after
3226 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( 3226 EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
3227 browser2->tab_strip_model()->GetActiveWebContents(), 3227 browser2->tab_strip_model()->GetActiveWebContents(),
3228 "domAutomationController.send(window.showModalDialog !== undefined);", 3228 "domAutomationController.send(window.showModalDialog !== undefined);",
3229 &result)); 3229 &result));
3230 EXPECT_TRUE(result); 3230 EXPECT_TRUE(result);
3231 } 3231 }
3232 3232
3233 #endif // !defined(CHROME_OS) 3233 #endif // !defined(CHROME_OS)
3234 3234
3235 } // namespace policy 3235 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698