| Index: net/url_request/url_request_job_manager.cc
|
| diff --git a/net/url_request/url_request_job_manager.cc b/net/url_request/url_request_job_manager.cc
|
| index 9ccf1d4e352606eb483df898d7f7a32b83e7560d..f4544c3f34698cdfa80363674cf143e81e5f86f1 100644
|
| --- a/net/url_request/url_request_job_manager.cc
|
| +++ b/net/url_request/url_request_job_manager.cc
|
| @@ -30,14 +30,13 @@ struct SchemeToFactory {
|
| } // namespace
|
|
|
| static const SchemeToFactory kBuiltinFactories[] = {
|
| - { "http", URLRequestHttpJob::Factory },
|
| - { "https", URLRequestHttpJob::Factory },
|
| + {"http", URLRequestHttpJob::Factory},
|
| + {"https", URLRequestHttpJob::Factory},
|
|
|
| #if !defined(OS_IOS)
|
| - { "ws", URLRequestHttpJob::Factory },
|
| - { "wss", URLRequestHttpJob::Factory },
|
| + {"ws", URLRequestHttpJob::Factory},
|
| + {"wss", URLRequestHttpJob::Factory},
|
| #endif // !defined(OS_IOS)
|
| -
|
| };
|
|
|
| // static
|
| @@ -46,7 +45,8 @@ URLRequestJobManager* URLRequestJobManager::GetInstance() {
|
| }
|
|
|
| URLRequestJob* URLRequestJobManager::CreateJob(
|
| - URLRequest* request, NetworkDelegate* network_delegate) const {
|
| + URLRequest* request,
|
| + NetworkDelegate* network_delegate) const {
|
| DCHECK(IsAllowedThread());
|
|
|
| // If we are given an invalid URL, then don't even try to inspect the scheme.
|
| @@ -108,8 +108,8 @@ 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);
|
| + URLRequestJob* job =
|
| + (kBuiltinFactories[i].factory)(request, network_delegate, scheme);
|
| DCHECK(job); // The built-in factories are not expected to fail!
|
| return job;
|
| }
|
| @@ -147,9 +147,8 @@ URLRequestJob* URLRequestJobManager::MaybeInterceptRedirect(
|
|
|
| InterceptorList::const_iterator i;
|
| for (i = interceptors_.begin(); i != interceptors_.end(); ++i) {
|
| - URLRequestJob* job = (*i)->MaybeInterceptRedirect(request,
|
| - network_delegate,
|
| - location);
|
| + URLRequestJob* job =
|
| + (*i)->MaybeInterceptRedirect(request, network_delegate, location);
|
| if (job)
|
| return job;
|
| }
|
| @@ -157,7 +156,8 @@ URLRequestJob* URLRequestJobManager::MaybeInterceptRedirect(
|
| }
|
|
|
| URLRequestJob* URLRequestJobManager::MaybeInterceptResponse(
|
| - URLRequest* request, NetworkDelegate* network_delegate) const {
|
| + URLRequest* request,
|
| + NetworkDelegate* network_delegate) const {
|
| DCHECK(IsAllowedThread());
|
| if (!request->url().is_valid() ||
|
| request->load_flags() & LOAD_DISABLE_INTERCEPT ||
|
| @@ -179,8 +179,8 @@ URLRequestJob* URLRequestJobManager::MaybeInterceptResponse(
|
|
|
| InterceptorList::const_iterator i;
|
| for (i = interceptors_.begin(); i != interceptors_.end(); ++i) {
|
| - URLRequestJob* job = (*i)->MaybeInterceptResponse(request,
|
| - network_delegate);
|
| + URLRequestJob* job =
|
| + (*i)->MaybeInterceptResponse(request, network_delegate);
|
| if (job)
|
| return job;
|
| }
|
| @@ -248,10 +248,10 @@ void URLRequestJobManager::UnregisterRequestInterceptor(
|
| }
|
|
|
| URLRequestJobManager::URLRequestJobManager()
|
| - : allowed_thread_(0),
|
| - allowed_thread_initialized_(false) {
|
| + : allowed_thread_(0), allowed_thread_initialized_(false) {
|
| }
|
|
|
| -URLRequestJobManager::~URLRequestJobManager() {}
|
| +URLRequestJobManager::~URLRequestJobManager() {
|
| +}
|
|
|
| } // namespace net
|
|
|