diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-26 10:20:38 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-26 10:20:38 +0100 |
| commit | 58e6fbe4ee35d65e14b626c557d37565bf8ad179 (patch) | |
| tree | 8cf095f4f552a47efa4566d1983574e75bc85595 /net | |
| parent | 0e2fcb857cf4c6230fc3aa213f6a0b0b4f644fd0 (diff) | |
| download | chromium_org-58e6fbe4ee35d65e14b626c557d37565bf8ad179.tar.gz | |
Merge from Chromium at DEPS revision r213780
This commit was generated by merge_to_master.py.
Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e
Diffstat (limited to 'net')
| -rw-r--r-- | net/http/transport_security_state_static.h | 2 | ||||
| -rw-r--r-- | net/http/transport_security_state_static.json | 2 | ||||
| -rw-r--r-- | net/net_unittests.isolate | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/net/http/transport_security_state_static.h b/net/http/transport_security_state_static.h index 10d7909bea..9967dac139 100644 --- a/net/http/transport_security_state_static.h +++ b/net/http/transport_security_state_static.h @@ -829,6 +829,8 @@ static const struct HSTSPreload kPreloadedSTS[] = { {26, true, "\005forum\016quantifiedself\003com", true, kNoPins, DOMAIN_NOT_PINNED }, {11, true, "\006shodan\002io", true, kNoPins, DOMAIN_NOT_PINNED }, {18, true, "\015rapidresearch\002me", true, kNoPins, DOMAIN_NOT_PINNED }, + {14, true, "\010surkatty\003com", true, kNoPins, DOMAIN_NOT_PINNED }, + {21, true, "\017securityheaders\003com", true, kNoPins, DOMAIN_NOT_PINNED }, }; static const size_t kNumPreloadedSTS = ARRAYSIZE_UNSAFE(kPreloadedSTS); diff --git a/net/http/transport_security_state_static.json b/net/http/transport_security_state_static.json index 0a039ab61d..91db9d944b 100644 --- a/net/http/transport_security_state_static.json +++ b/net/http/transport_security_state_static.json @@ -619,6 +619,8 @@ { "name": "forum.quantifiedself.com", "include_subdomains": true, "mode": "force-https" }, { "name": "shodan.io", "include_subdomains": true, "mode": "force-https" }, { "name": "rapidresearch.me", "include_subdomains": true, "mode": "force-https" }, + { "name": "surkatty.com", "include_subdomains": true, "mode": "force-https" }, + { "name": "securityheaders.com", "include_subdomains": true, "mode": "force-https" }, // Entries that are only valid if the client supports SNI. { "name": "gmail.com", "mode": "force-https", "pins": "google", "snionly": true }, diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate index 06bd41b551..71a2dc05db 100644 --- a/net/net_unittests.isolate +++ b/net/net_unittests.isolate @@ -21,7 +21,7 @@ 'command': [ '../testing/xvfb.py', '<(PRODUCT_DIR)', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ @@ -35,7 +35,7 @@ 'isolate_dependency_tracked': [ '../testing/test_env.py', '../tools/swarm_client/run_isolated.py', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ @@ -51,7 +51,7 @@ 'variables': { 'command': [ '../testing/test_env.py', - '../tools/swarm_client/run_test_cases.py', + '../tools/swarm_client/googletest/run_test_cases.py', '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', ], }, |