| Index: net/base/load_flags_list.h
|
| diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h
|
| index 643e310c7d433fd2beabc299782fb8adf90c1465..8f3fe0e08c4a382acd76e18734c3ab90ae3dee84 100644
|
| --- a/net/base/load_flags_list.h
|
| +++ b/net/base/load_flags_list.h
|
| @@ -25,76 +25,71 @@ LOAD_FLAG(PREFERRING_CACHE, 1 << 2)
|
| // resource from the cache (or some equivalent local store).
|
| LOAD_FLAG(ONLY_FROM_CACHE, 1 << 3)
|
|
|
| -// Indicate that if the request fails at the network level in a way that
|
| -// indicates the source is unreachable, the request should fail over
|
| -// to as if LOAD_PREFERRING_CACHE had been set.
|
| -LOAD_FLAG(FROM_CACHE_IF_OFFLINE, 1 << 4)
|
| -
|
| // This is a navigation that will not use the cache at all. It does not
|
| // impact the HTTP request headers.
|
| -LOAD_FLAG(DISABLE_CACHE, 1 << 5)
|
| +LOAD_FLAG(DISABLE_CACHE, 1 << 4)
|
|
|
| // If present, causes certificate revocation checks to be skipped on secure
|
| // connections.
|
| -LOAD_FLAG(DISABLE_CERT_REVOCATION_CHECKING, 1 << 6)
|
| +LOAD_FLAG(DISABLE_CERT_REVOCATION_CHECKING, 1 << 5)
|
|
|
| // This load will not make any changes to cookies, including storing new
|
| // cookies or updating existing ones.
|
| -LOAD_FLAG(DO_NOT_SAVE_COOKIES, 1 << 7)
|
| +LOAD_FLAG(DO_NOT_SAVE_COOKIES, 1 << 6)
|
|
|
| // Do not resolve proxies. This override is used when downloading PAC files
|
| // to avoid having a circular dependency.
|
| -LOAD_FLAG(BYPASS_PROXY, 1 << 8)
|
| +LOAD_FLAG(BYPASS_PROXY, 1 << 7)
|
|
|
| // Requires EV certificate verification.
|
| -LOAD_FLAG(VERIFY_EV_CERT, 1 << 9)
|
| +LOAD_FLAG(VERIFY_EV_CERT, 1 << 8)
|
|
|
| // This load will not send any cookies.
|
| -LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 10)
|
| +LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 9)
|
|
|
| // This load will not send authentication data (user name/password)
|
| // to the server (as opposed to the proxy).
|
| -LOAD_FLAG(DO_NOT_SEND_AUTH_DATA, 1 << 11)
|
| +LOAD_FLAG(DO_NOT_SEND_AUTH_DATA, 1 << 10)
|
|
|
| // This should only be used for testing (set by HttpNetworkTransaction).
|
| -LOAD_FLAG(IGNORE_ALL_CERT_ERRORS, 1 << 12)
|
| +LOAD_FLAG(IGNORE_ALL_CERT_ERRORS, 1 << 11)
|
|
|
| // Indicate that this is a top level frame, so that we don't assume it is a
|
| // subresource and speculatively pre-connect or pre-resolve when a referring
|
| // page is loaded.
|
| -LOAD_FLAG(MAIN_FRAME, 1 << 13)
|
| +LOAD_FLAG(MAIN_FRAME, 1 << 12)
|
|
|
| // Indicate that this is a sub frame, and hence it might have subresources that
|
| // should be speculatively resolved, or even speculatively preconnected.
|
| -LOAD_FLAG(SUB_FRAME, 1 << 14)
|
| +LOAD_FLAG(SUB_FRAME, 1 << 13)
|
|
|
| // If present, intercept actual request/response headers from network stack
|
| // and report them to renderer. This includes cookies, so the flag is only
|
| // respected if renderer has CanReadRawCookies capability in the security
|
| // policy.
|
| -LOAD_FLAG(REPORT_RAW_HEADERS, 1 << 15)
|
| +LOAD_FLAG(REPORT_RAW_HEADERS, 1 << 14)
|
|
|
| // Indicates that this load was motivated by the rel=prefetch feature,
|
| // and is (in theory) not intended for the current frame.
|
| -LOAD_FLAG(PREFETCH, 1 << 16)
|
| +LOAD_FLAG(PREFETCH, 1 << 15)
|
|
|
| // Indicates that this is a load that ignores limits and should complete
|
| // immediately.
|
| -LOAD_FLAG(IGNORE_LIMITS, 1 << 17)
|
| +LOAD_FLAG(IGNORE_LIMITS, 1 << 16)
|
|
|
| // Indicates that the operation is somewhat likely to be due to an
|
| // explicit user action. This can be used as a hint to treat the
|
| // request with higher priority.
|
| -LOAD_FLAG(MAYBE_USER_GESTURE, 1 << 18)
|
| +LOAD_FLAG(MAYBE_USER_GESTURE, 1 << 17)
|
|
|
| // Indicates that the username:password portion of the URL should not
|
| // be honored, but that other forms of authority may be used.
|
| -LOAD_FLAG(DO_NOT_USE_EMBEDDED_IDENTITY, 1 << 19)
|
| +LOAD_FLAG(DO_NOT_USE_EMBEDDED_IDENTITY, 1 << 18)
|
|
|
| // Send request directly to the origin if the effective proxy is the data
|
| // reduction proxy.
|
| // TODO(rcs): Remove this flag as soon as http://crbug.com/339237 is resolved.
|
| -LOAD_FLAG(BYPASS_DATA_REDUCTION_PROXY, 1 << 20)
|
| +LOAD_FLAG(BYPASS_DATA_REDUCTION_PROXY, 1 << 19)
|
|
|
| // Indicates the the request is an asynchronous revalidation.
|
| -LOAD_FLAG(ASYNC_REVALIDATION, 1 << 21)
|
| +LOAD_FLAG(ASYNC_REVALIDATION, 1 << 20)
|
|
|