diff options
| author | scottmg <scottmg@chromium.org> | 2015-02-20 12:16:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-20 20:16:52 +0000 |
| commit | 66af5887986c6e397eb502be312a98dc6e7d6d9b (patch) | |
| tree | e50beca07d4d0b25262e753fd4506bd3a16161dd /net | |
| parent | 70b983128e5d59a37902bf5259eccb25c0378a4a (diff) | |
| download | chromium_src-66af5887986c6e397eb502be312a98dc6e7d6d9b.zip chromium_src-66af5887986c6e397eb502be312a98dc6e7d6d9b.tar.gz chromium_src-66af5887986c6e397eb502be312a98dc6e7d6d9b.tar.bz2 | |
win vs2015: fix shadowing warnings in net/url_request
d:\src\cr2\src\net\url_request\url_request_filter.cc(149): error C2220: warning treated as error - no 'object' file generated
d:\src\cr2\src\net\url_request\url_request_filter.cc(149): warning C4456: declaration of 'it' hides previous local declaration
d:\src\cr2\src\net\url_request\url_request_filter.cc(141): note: see declaration of 'it'
d:\src\cr2\src\net\url_request\url_request_http_job.cc(917): error C2220: warning treated as error - no 'object' file generated
d:\src\cr2\src\net\url_request\url_request_http_job.cc(917): warning C4456: declaration of 'context' hides previous local declaration
d:\src\cr2\src\net\url_request\url_request_http_job.cc(859): note: see declaration of 'context'
d:\src\cr2\src\net\url_request\url_request_job_manager.cc(79): error C2220: warning treated as error - no 'object' file generated
d:\src\cr2\src\net\url_request\url_request_job_manager.cc(79): warning C4456: declaration of 'job' hides previous local declaration
d:\src\cr2\src\net\url_request\url_request_job_manager.cc(71): note: see declaration of 'job'
ninja: build stopped: subcommand failed.
R=eroman@chromium.org
BUG=440500
Review URL: https://codereview.chromium.org/937393002
Cr-Commit-Position: refs/heads/master@{#317384}
Diffstat (limited to 'net')
| -rw-r--r-- | net/url_request/url_request_filter.cc | 10 | ||||
| -rw-r--r-- | net/url_request/url_request_http_job.cc | 1 | ||||
| -rw-r--r-- | net/url_request/url_request_job_manager.cc | 8 |
3 files changed, 10 insertions, 9 deletions
diff --git a/net/url_request/url_request_filter.cc b/net/url_request/url_request_filter.cc index eaa3325..290bc99 100644 --- a/net/url_request/url_request_filter.cc +++ b/net/url_request/url_request_filter.cc @@ -138,10 +138,12 @@ URLRequestJob* URLRequestFilter::MaybeInterceptRequest( const std::string hostname = request->url().host(); const std::string scheme = request->url().scheme(); - HostnameInterceptorMap::const_iterator it = - hostname_interceptor_map_.find(make_pair(scheme, hostname)); - if (it != hostname_interceptor_map_.end()) - job = it->second->MaybeInterceptRequest(request, network_delegate); + { + HostnameInterceptorMap::const_iterator it = + hostname_interceptor_map_.find(make_pair(scheme, hostname)); + if (it != hostname_interceptor_map_.end()) + job = it->second->MaybeInterceptRequest(request, network_delegate); + } if (!job) { // Not in the hostname map, check the url map. diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index 098ef85..546afba 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -914,7 +914,6 @@ void URLRequestHttpJob::OnStartCompleted(int result) { NotifySSLCertificateError(info, true); } else { // Maybe overridable, maybe not. Ask the delegate to decide. - const URLRequestContext* context = request_->context(); TransportSecurityState* state = context->transport_security_state(); const bool fatal = state && state->ShouldSSLErrorsBeFatal(request_info_.url.host()); diff --git a/net/url_request/url_request_job_manager.cc b/net/url_request/url_request_job_manager.cc index 9fc963d..61e8bf2 100644 --- a/net/url_request/url_request_job_manager.cc +++ b/net/url_request/url_request_job_manager.cc @@ -76,10 +76,10 @@ URLRequestJob* URLRequestJobManager::CreateJob( // See if the request should be handled by a built-in protocol factory. for (size_t i = 0; i < arraysize(kBuiltinFactories); ++i) { if (scheme == kBuiltinFactories[i].scheme) { - URLRequestJob* job = (kBuiltinFactories[i].factory)( - request, network_delegate, scheme); - DCHECK(job); // The built-in factories are not expected to fail! - return job; + URLRequestJob* new_job = + (kBuiltinFactories[i].factory)(request, network_delegate, scheme); + DCHECK(new_job); // The built-in factories are not expected to fail! + return new_job; } } |