| 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 28 matching lines...) Expand all Loading... |
| 39 #include "chrome/browser/extensions/extension_management_constants.h" | 39 #include "chrome/browser/extensions/extension_management_constants.h" |
| 40 #include "chrome/browser/extensions/extension_service.h" | 40 #include "chrome/browser/extensions/extension_service.h" |
| 41 #include "chrome/browser/extensions/unpacked_installer.h" | 41 #include "chrome/browser/extensions/unpacked_installer.h" |
| 42 #include "chrome/browser/extensions/updater/extension_cache_fake.h" | 42 #include "chrome/browser/extensions/updater/extension_cache_fake.h" |
| 43 #include "chrome/browser/extensions/updater/extension_updater.h" | 43 #include "chrome/browser/extensions/updater/extension_updater.h" |
| 44 #include "chrome/browser/infobars/infobar_service.h" | 44 #include "chrome/browser/infobars/infobar_service.h" |
| 45 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 45 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
| 46 #include "chrome/browser/media/media_stream_devices_controller.h" | 46 #include "chrome/browser/media/media_stream_devices_controller.h" |
| 47 #include "chrome/browser/metrics/variations/variations_service.h" | 47 #include "chrome/browser/metrics/variations/variations_service.h" |
| 48 #include "chrome/browser/net/prediction_options.h" | 48 #include "chrome/browser/net/prediction_options.h" |
| 49 #include "chrome/browser/net/ssl_config_service_manager.h" |
| 49 #include "chrome/browser/net/url_request_mock_util.h" | 50 #include "chrome/browser/net/url_request_mock_util.h" |
| 50 #include "chrome/browser/plugins/plugin_prefs.h" | 51 #include "chrome/browser/plugins/plugin_prefs.h" |
| 51 #include "chrome/browser/policy/cloud/test_request_interceptor.h" | 52 #include "chrome/browser/policy/cloud/test_request_interceptor.h" |
| 52 #include "chrome/browser/policy/profile_policy_connector.h" | 53 #include "chrome/browser/policy/profile_policy_connector.h" |
| 53 #include "chrome/browser/policy/profile_policy_connector_factory.h" | 54 #include "chrome/browser/policy/profile_policy_connector_factory.h" |
| 54 #include "chrome/browser/prefs/session_startup_pref.h" | 55 #include "chrome/browser/prefs/session_startup_pref.h" |
| 55 #include "chrome/browser/profiles/profile.h" | 56 #include "chrome/browser/profiles/profile.h" |
| 56 #include "chrome/browser/search/instant_service.h" | 57 #include "chrome/browser/search/instant_service.h" |
| 57 #include "chrome/browser/search/instant_service_factory.h" | 58 #include "chrome/browser/search/instant_service_factory.h" |
| 58 #include "chrome/browser/search/search.h" | 59 #include "chrome/browser/search/search.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 #include "extensions/browser/extension_system.h" | 127 #include "extensions/browser/extension_system.h" |
| 127 #include "extensions/browser/process_manager.h" | 128 #include "extensions/browser/process_manager.h" |
| 128 #include "extensions/browser/uninstall_reason.h" | 129 #include "extensions/browser/uninstall_reason.h" |
| 129 #include "extensions/common/constants.h" | 130 #include "extensions/common/constants.h" |
| 130 #include "extensions/common/extension.h" | 131 #include "extensions/common/extension.h" |
| 131 #include "extensions/common/extension_set.h" | 132 #include "extensions/common/extension_set.h" |
| 132 #include "net/base/net_errors.h" | 133 #include "net/base/net_errors.h" |
| 133 #include "net/base/net_util.h" | 134 #include "net/base/net_util.h" |
| 134 #include "net/base/url_util.h" | 135 #include "net/base/url_util.h" |
| 135 #include "net/http/http_stream_factory.h" | 136 #include "net/http/http_stream_factory.h" |
| 137 #include "net/ssl/ssl_config.h" |
| 138 #include "net/ssl/ssl_config_service.h" |
| 136 #include "net/test/url_request/url_request_failed_job.h" | 139 #include "net/test/url_request/url_request_failed_job.h" |
| 137 #include "net/test/url_request/url_request_mock_http_job.h" | 140 #include "net/test/url_request/url_request_mock_http_job.h" |
| 138 #include "net/url_request/url_request.h" | 141 #include "net/url_request/url_request.h" |
| 139 #include "net/url_request/url_request_filter.h" | 142 #include "net/url_request/url_request_filter.h" |
| 140 #include "policy/policy_constants.h" | 143 #include "policy/policy_constants.h" |
| 141 #include "testing/gmock/include/gmock/gmock.h" | 144 #include "testing/gmock/include/gmock/gmock.h" |
| 142 #include "testing/gtest/include/gtest/gtest.h" | 145 #include "testing/gtest/include/gtest/gtest.h" |
| 143 #include "third_party/WebKit/public/web/WebInputEvent.h" | 146 #include "third_party/WebKit/public/web/WebInputEvent.h" |
| 144 #include "ui/base/l10n/l10n_util.h" | 147 #include "ui/base/l10n/l10n_util.h" |
| 145 #include "ui/base/page_transition_types.h" | 148 #include "ui/base/page_transition_types.h" |
| (...skipping 2111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2257 blacklist.Append(new base::StringValue(folder_path)); | 2260 blacklist.Append(new base::StringValue(folder_path)); |
| 2258 policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, | 2261 policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, |
| 2259 POLICY_SCOPE_USER, blacklist.DeepCopy(), NULL); | 2262 POLICY_SCOPE_USER, blacklist.DeepCopy(), NULL); |
| 2260 UpdateProviderPolicy(policies); | 2263 UpdateProviderPolicy(policies); |
| 2261 FlushBlacklistPolicy(); | 2264 FlushBlacklistPolicy(); |
| 2262 | 2265 |
| 2263 CheckCanOpenURL(browser(), file_path1.c_str()); | 2266 CheckCanOpenURL(browser(), file_path1.c_str()); |
| 2264 CheckURLIsBlocked(browser(), file_path2.c_str()); | 2267 CheckURLIsBlocked(browser(), file_path2.c_str()); |
| 2265 } | 2268 } |
| 2266 | 2269 |
| 2270 static bool IsMinSSLVersionTLS12(Profile* profile) { |
| 2271 scoped_refptr<net::SSLConfigService> config_service( |
| 2272 profile->GetSSLConfigService()); |
| 2273 net::SSLConfig config; |
| 2274 config_service->GetSSLConfig(&config); |
| 2275 return config.version_min == net::SSL_PROTOCOL_VERSION_TLS1_2; |
| 2276 } |
| 2277 |
| 2278 IN_PROC_BROWSER_TEST_F(PolicyTest, SSLVersionMin) { |
| 2279 PrefService* prefs = g_browser_process->local_state(); |
| 2280 |
| 2281 const std::string new_value("tls1.2"); |
| 2282 const std::string default_value(prefs->GetString(prefs::kSSLVersionMin)); |
| 2283 |
| 2284 EXPECT_NE(default_value, new_value); |
| 2285 EXPECT_FALSE(IsMinSSLVersionTLS12(browser()->profile())); |
| 2286 |
| 2287 PolicyMap policies; |
| 2288 policies.Set(key::kSSLVersionMin, |
| 2289 POLICY_LEVEL_MANDATORY, |
| 2290 POLICY_SCOPE_USER, |
| 2291 new base::StringValue(new_value), |
| 2292 NULL); |
| 2293 UpdateProviderPolicy(policies); |
| 2294 |
| 2295 EXPECT_TRUE(IsMinSSLVersionTLS12(browser()->profile())); |
| 2296 } |
| 2297 |
| 2267 #if !defined(OS_MACOSX) | 2298 #if !defined(OS_MACOSX) |
| 2268 IN_PROC_BROWSER_TEST_F(PolicyTest, FullscreenAllowedBrowser) { | 2299 IN_PROC_BROWSER_TEST_F(PolicyTest, FullscreenAllowedBrowser) { |
| 2269 PolicyMap policies; | 2300 PolicyMap policies; |
| 2270 policies.Set(key::kFullscreenAllowed, | 2301 policies.Set(key::kFullscreenAllowed, |
| 2271 POLICY_LEVEL_MANDATORY, | 2302 POLICY_LEVEL_MANDATORY, |
| 2272 POLICY_SCOPE_USER, | 2303 POLICY_SCOPE_USER, |
| 2273 new base::FundamentalValue(false), | 2304 new base::FundamentalValue(false), |
| 2274 NULL); | 2305 NULL); |
| 2275 UpdateProviderPolicy(policies); | 2306 UpdateProviderPolicy(policies); |
| 2276 | 2307 |
| (...skipping 1013 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3290 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( | 3321 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( |
| 3291 browser2->tab_strip_model()->GetActiveWebContents(), | 3322 browser2->tab_strip_model()->GetActiveWebContents(), |
| 3292 "domAutomationController.send(window.showModalDialog !== undefined);", | 3323 "domAutomationController.send(window.showModalDialog !== undefined);", |
| 3293 &result)); | 3324 &result)); |
| 3294 EXPECT_TRUE(result); | 3325 EXPECT_TRUE(result); |
| 3295 } | 3326 } |
| 3296 | 3327 |
| 3297 #endif // !defined(CHROME_OS) | 3328 #endif // !defined(CHROME_OS) |
| 3298 | 3329 |
| 3299 } // namespace policy | 3330 } // namespace policy |
| OLD | NEW |