summaryrefslogtreecommitdiffstats
path: root/ios/net
diff options
context:
space:
mode:
authordroger <droger@chromium.org>2015-08-07 00:38:51 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-07 07:39:24 +0000
commit73cd024fd163bab3fe5022d25d00062d8932a849 (patch)
treeb85d7b25f9c22afe4de5acaa3208c891dff86cdf /ios/net
parentc3bde8128e5b2b67cbdb5b7df49b54fe448f0092 (diff)
downloadchromium_src-73cd024fd163bab3fe5022d25d00062d8932a849.zip
chromium_src-73cd024fd163bab3fe5022d25d00062d8932a849.tar.gz
chromium_src-73cd024fd163bab3fe5022d25d00062d8932a849.tar.bz2
[iOS] Cleanup URLRequest load flags
This CL cleans up the load flags: - removes LOAD_VERIFY_EV_CERT, as this feature has been disabled - cleans up cache flags to catch future changes in the OS enum There should be no user-visible changes. BUG=409055 Review URL: https://codereview.chromium.org/1278743002 Cr-Commit-Position: refs/heads/master@{#342313}
Diffstat (limited to 'ios/net')
-rw-r--r--ios/net/crn_http_protocol_handler.mm7
1 files changed, 3 insertions, 4 deletions
diff --git a/ios/net/crn_http_protocol_handler.mm b/ios/net/crn_http_protocol_handler.mm
index 189861c..1638eab 100644
--- a/ios/net/crn_http_protocol_handler.mm
+++ b/ios/net/crn_http_protocol_handler.mm
@@ -583,9 +583,8 @@ void HttpProtocolHandlerCore::Destruct(const HttpProtocolHandlerCore* x) {
void HttpProtocolHandlerCore::SetLoadFlags() {
DCHECK(thread_checker_.CalledOnValidThread());
+ int load_flags = LOAD_NORMAL;
- int load_flags = LOAD_VERIFY_EV_CERT;
- // TODO(droger) Support MAIN_FRAME and SUB_FRAME flags.
if (![request_ HTTPShouldHandleCookies])
load_flags |= LOAD_DO_NOT_SEND_COOKIES | LOAD_DO_NOT_SAVE_COOKIES;
@@ -625,8 +624,8 @@ void HttpProtocolHandlerCore::SetLoadFlags() {
case NSURLRequestReloadRevalidatingCacheData:
load_flags |= LOAD_VALIDATE_CACHE;
break;
- default:
- // For the NSURLRequestUseProtocolCachePolicy case.
+ case NSURLRequestUseProtocolCachePolicy:
+ // Do nothing, normal load.
break;
}
}