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 27 matching lines...) Expand all Loading... | |
38 #include "chrome/browser/extensions/crx_installer.h" | 38 #include "chrome/browser/extensions/crx_installer.h" |
39 #include "chrome/browser/extensions/extension_service.h" | 39 #include "chrome/browser/extensions/extension_service.h" |
40 #include "chrome/browser/extensions/unpacked_installer.h" | 40 #include "chrome/browser/extensions/unpacked_installer.h" |
41 #include "chrome/browser/extensions/updater/extension_cache_fake.h" | 41 #include "chrome/browser/extensions/updater/extension_cache_fake.h" |
42 #include "chrome/browser/extensions/updater/extension_updater.h" | 42 #include "chrome/browser/extensions/updater/extension_updater.h" |
43 #include "chrome/browser/infobars/infobar_service.h" | 43 #include "chrome/browser/infobars/infobar_service.h" |
44 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 44 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
45 #include "chrome/browser/media/media_stream_devices_controller.h" | 45 #include "chrome/browser/media/media_stream_devices_controller.h" |
46 #include "chrome/browser/metrics/variations/variations_service.h" | 46 #include "chrome/browser/metrics/variations/variations_service.h" |
47 #include "chrome/browser/net/prediction_options.h" | 47 #include "chrome/browser/net/prediction_options.h" |
48 #include "chrome/browser/net/ssl_config_service_manager.h" | |
48 #include "chrome/browser/net/url_request_mock_util.h" | 49 #include "chrome/browser/net/url_request_mock_util.h" |
49 #include "chrome/browser/plugins/plugin_prefs.h" | 50 #include "chrome/browser/plugins/plugin_prefs.h" |
50 #include "chrome/browser/policy/cloud/test_request_interceptor.h" | 51 #include "chrome/browser/policy/cloud/test_request_interceptor.h" |
51 #include "chrome/browser/policy/profile_policy_connector.h" | 52 #include "chrome/browser/policy/profile_policy_connector.h" |
52 #include "chrome/browser/policy/profile_policy_connector_factory.h" | 53 #include "chrome/browser/policy/profile_policy_connector_factory.h" |
53 #include "chrome/browser/prefs/session_startup_pref.h" | 54 #include "chrome/browser/prefs/session_startup_pref.h" |
54 #include "chrome/browser/profiles/profile.h" | 55 #include "chrome/browser/profiles/profile.h" |
55 #include "chrome/browser/search/instant_service.h" | 56 #include "chrome/browser/search/instant_service.h" |
56 #include "chrome/browser/search/instant_service_factory.h" | 57 #include "chrome/browser/search/instant_service_factory.h" |
57 #include "chrome/browser/search/search.h" | 58 #include "chrome/browser/search/search.h" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
125 #include "extensions/browser/extension_system.h" | 126 #include "extensions/browser/extension_system.h" |
126 #include "extensions/browser/process_manager.h" | 127 #include "extensions/browser/process_manager.h" |
127 #include "extensions/browser/uninstall_reason.h" | 128 #include "extensions/browser/uninstall_reason.h" |
128 #include "extensions/common/constants.h" | 129 #include "extensions/common/constants.h" |
129 #include "extensions/common/extension.h" | 130 #include "extensions/common/extension.h" |
130 #include "extensions/common/extension_set.h" | 131 #include "extensions/common/extension_set.h" |
131 #include "net/base/net_errors.h" | 132 #include "net/base/net_errors.h" |
132 #include "net/base/net_util.h" | 133 #include "net/base/net_util.h" |
133 #include "net/base/url_util.h" | 134 #include "net/base/url_util.h" |
134 #include "net/http/http_stream_factory.h" | 135 #include "net/http/http_stream_factory.h" |
136 #include "net/ssl/ssl_config.h" | |
137 #include "net/ssl/ssl_config_service.h" | |
135 #include "net/test/url_request/url_request_failed_job.h" | 138 #include "net/test/url_request/url_request_failed_job.h" |
136 #include "net/test/url_request/url_request_mock_http_job.h" | 139 #include "net/test/url_request/url_request_mock_http_job.h" |
137 #include "net/url_request/url_request.h" | 140 #include "net/url_request/url_request.h" |
138 #include "net/url_request/url_request_filter.h" | 141 #include "net/url_request/url_request_filter.h" |
139 #include "policy/policy_constants.h" | 142 #include "policy/policy_constants.h" |
140 #include "testing/gmock/include/gmock/gmock.h" | 143 #include "testing/gmock/include/gmock/gmock.h" |
141 #include "testing/gtest/include/gtest/gtest.h" | 144 #include "testing/gtest/include/gtest/gtest.h" |
142 #include "third_party/WebKit/public/web/WebInputEvent.h" | 145 #include "third_party/WebKit/public/web/WebInputEvent.h" |
143 #include "ui/base/l10n/l10n_util.h" | 146 #include "ui/base/l10n/l10n_util.h" |
144 #include "ui/base/page_transition_types.h" | 147 #include "ui/base/page_transition_types.h" |
(...skipping 2054 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2199 blacklist.Append(new base::StringValue(folder_path)); | 2202 blacklist.Append(new base::StringValue(folder_path)); |
2200 policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, | 2203 policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, |
2201 POLICY_SCOPE_USER, blacklist.DeepCopy(), NULL); | 2204 POLICY_SCOPE_USER, blacklist.DeepCopy(), NULL); |
2202 UpdateProviderPolicy(policies); | 2205 UpdateProviderPolicy(policies); |
2203 FlushBlacklistPolicy(); | 2206 FlushBlacklistPolicy(); |
2204 | 2207 |
2205 CheckCanOpenURL(browser(), file_path1.c_str()); | 2208 CheckCanOpenURL(browser(), file_path1.c_str()); |
2206 CheckURLIsBlocked(browser(), file_path2.c_str()); | 2209 CheckURLIsBlocked(browser(), file_path2.c_str()); |
2207 } | 2210 } |
2208 | 2211 |
2212 static bool IsMinSSLVersionTLS12(Profile *profile) { | |
Joao da Silva
2014/10/14 08:40:10
nit: Profile* profile
agl
2014/10/14 17:39:51
Done.
| |
2213 scoped_refptr<net::SSLConfigService> config_service( | |
2214 profile->GetSSLConfigService()); | |
2215 net::SSLConfig config; | |
2216 config_service->GetSSLConfig(&config); | |
2217 return config.version_min == net::SSL_PROTOCOL_VERSION_TLS1_2; | |
2218 } | |
2219 | |
2220 IN_PROC_BROWSER_TEST_F(PolicyTest, SSLVersionMin) { | |
2221 PrefService* prefs = browser()->profile()->GetPrefs(); | |
2222 | |
2223 const std::string new_value("tls1.2"); | |
2224 const std::string default_value(prefs->GetString(prefs::kSSLVersionMin)); | |
2225 | |
2226 EXPECT_NE(default_value, new_value); | |
2227 EXPECT_FALSE(IsMinSSLVersionTLS12(browser()->profile())); | |
2228 | |
2229 PolicyMap policies; | |
2230 policies.Set(key::kSSLVersionMin, | |
2231 POLICY_LEVEL_MANDATORY, | |
2232 POLICY_SCOPE_USER, | |
2233 new base::StringValue(new_value), | |
2234 NULL); | |
2235 UpdateProviderPolicy(policies); | |
2236 | |
2237 EXPECT_TRUE(IsMinSSLVersionTLS12(browser()->profile())); | |
2238 } | |
2239 | |
2209 #if !defined(OS_MACOSX) | 2240 #if !defined(OS_MACOSX) |
2210 IN_PROC_BROWSER_TEST_F(PolicyTest, FullscreenAllowedBrowser) { | 2241 IN_PROC_BROWSER_TEST_F(PolicyTest, FullscreenAllowedBrowser) { |
2211 PolicyMap policies; | 2242 PolicyMap policies; |
2212 policies.Set(key::kFullscreenAllowed, | 2243 policies.Set(key::kFullscreenAllowed, |
2213 POLICY_LEVEL_MANDATORY, | 2244 POLICY_LEVEL_MANDATORY, |
2214 POLICY_SCOPE_USER, | 2245 POLICY_SCOPE_USER, |
2215 new base::FundamentalValue(false), | 2246 new base::FundamentalValue(false), |
2216 NULL); | 2247 NULL); |
2217 UpdateProviderPolicy(policies); | 2248 UpdateProviderPolicy(policies); |
2218 | 2249 |
(...skipping 1013 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3232 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( | 3263 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( |
3233 browser2->tab_strip_model()->GetActiveWebContents(), | 3264 browser2->tab_strip_model()->GetActiveWebContents(), |
3234 "domAutomationController.send(window.showModalDialog !== undefined);", | 3265 "domAutomationController.send(window.showModalDialog !== undefined);", |
3235 &result)); | 3266 &result)); |
3236 EXPECT_TRUE(result); | 3267 EXPECT_TRUE(result); |
3237 } | 3268 } |
3238 | 3269 |
3239 #endif // !defined(CHROME_OS) | 3270 #endif // !defined(CHROME_OS) |
3240 | 3271 |
3241 } // namespace policy | 3272 } // namespace policy |
OLD | NEW |