Loading: bulk style errors fix in core/fetch

third_party/WebKit/Source/core/fetch/CrossOriginAccessControl.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 58 matching lines @@
   ResourceRequest preflightRequest(request.url());
   updateRequestForAccessControl(preflightRequest, securityOrigin,
                                 DoNotAllowStoredCredentials);
   preflightRequest.setHTTPMethod(HTTPNames::OPTIONS);
   preflightRequest.setHTTPHeaderField(HTTPNames::Access_Control_Request_Method,
                                       AtomicString(request.httpMethod()));
   preflightRequest.setPriority(request.priority());
   preflightRequest.setRequestContext(request.requestContext());
   preflightRequest.setSkipServiceWorker(WebURLRequest::SkipServiceWorker::All);
 
-  if (request.isExternalRequest())
+  if (request.isExternalRequest()) {
     preflightRequest.setHTTPHeaderField(
         HTTPNames::Access_Control_Request_External, "true");
+  }
 
   const HTTPHeaderMap& requestHeaderFields = request.httpHeaderFields();
 
   if (requestHeaderFields.size() > 0) {
     // Fetch API Spec: https://fetch.spec.whatwg.org/#cors-preflight-fetch-0
     Vector<String> headers;
     for (const auto& header : requestHeaderFields) {
       if (FetchUtils::isSimpleHeader(header.key, header.value)) {
         // Exclude simple headers.
         continue;
@@ skipping 89 matching lines @@
     // A wildcard Access-Control-Allow-Origin can not be used if credentials are
     // to be sent, even with Access-Control-Allow-Credentials set to true.
     if (includeCredentials == DoNotAllowStoredCredentials)
       return true;
     if (response.isHTTP()) {
       errorDescription = buildAccessControlFailureMessage(
           "A wildcard '*' cannot be used in the 'Access-Control-Allow-Origin' "
           "header when the credentials flag is true.",
           securityOrigin);
 
-      if (context == WebURLRequest::RequestContextXMLHttpRequest)
+      if (context == WebURLRequest::RequestContextXMLHttpRequest) {
         errorDescription.append(
             " The credentials mode of an XMLHttpRequest is controlled by the "
             "withCredentials attribute.");
+      }
 
       return false;
     }
   } else if (allowOriginHeaderValue != securityOrigin->toAtomicString()) {
     if (allowOriginHeaderValue.isNull()) {
       errorDescription = buildAccessControlFailureMessage(
           "No 'Access-Control-Allow-Origin' header is present on the requested "
           "resource.",
           securityOrigin);
 
       if (isInterestingStatusCode(statusCode)) {
         errorDescription.append(" The response had HTTP status code ");
         errorDescription.append(String::number(statusCode));
         errorDescription.append('.');
       }
 
-      if (context == WebURLRequest::RequestContextFetch)
+      if (context == WebURLRequest::RequestContextFetch) {
         errorDescription.append(
             " If an opaque response serves your needs, set the request's mode "
             "to 'no-cors' to fetch the resource with CORS disabled.");
+      }
 
       return false;
     }
 
     String detail;
     if (allowOriginHeaderValue.getString().find(isOriginSeparator, 0) !=
         kNotFound) {
       detail =
           "The 'Access-Control-Allow-Origin' header contains multiple values "
           "'" +
           allowOriginHeaderValue + "', but only one is allowed.";
     } else {
       KURL headerOrigin(KURL(), allowOriginHeaderValue);
-      if (!headerOrigin.isValid())
+      if (!headerOrigin.isValid()) {
         detail =
             "The 'Access-Control-Allow-Origin' header contains the invalid "
             "value '" +
             allowOriginHeaderValue + "'.";
-      else
+      } else {
         detail = "The 'Access-Control-Allow-Origin' header has a value '" +
                  allowOriginHeaderValue +
                  "' that is not equal to the supplied origin.";
+      }
     }
     errorDescription = buildAccessControlFailureMessage(detail, securityOrigin);
-    if (context == WebURLRequest::RequestContextFetch)
+    if (context == WebURLRequest::RequestContextFetch) {
       errorDescription.append(
           " Have the server send the header with a valid value, or, if an "
           "opaque response serves your needs, set the request's mode to "
           "'no-cors' to fetch the resource with CORS disabled.");
+    }
     return false;
   }
 
   if (includeCredentials == AllowStoredCredentials) {
     const AtomicString& allowCredentialsHeaderValue =
         response.httpHeaderField(allowCredentialsHeaderName);
     if (allowCredentialsHeaderValue != "true") {
       errorDescription = buildAccessControlFailureMessage(
           "Credentials flag is 'true', but the "
           "'Access-Control-Allow-Credentials' header is '" +
@@ skipping 159 matching lines @@
     //
     // This is equivalent to the step 2 in
     // https://fetch.spec.whatwg.org/#http-network-or-cache-fetch
     if (options.credentialsRequested == ClientDidNotRequestCredentials)
       options.allowCredentials = DoNotAllowStoredCredentials;
   }
   return true;
 }
 
 }  // namespace blink