Refactor nonce support.

third_party/WebKit/Source/core/fetch/ResourceLoaderOptions.h

 /*
  * Copyright (C) 2011 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 118 matching lines @@
     // updated.
     DataBufferingPolicy dataBufferingPolicy;
     StoredCredentials allowCredentials; // Whether HTTP credentials and cookies are sent with the request.
     CredentialRequest credentialsRequested; // Whether the client (e.g. XHR) wanted credentials in the first place.
     ContentSecurityPolicyDisposition contentSecurityPolicyOption;
     FetchInitiatorInfo initiatorInfo;
     RequestInitiatorContext requestInitiatorContext;
     SynchronousPolicy synchronousPolicy;
     CORSEnabled corsEnabled; // If the resource is loaded out-of-origin, whether or not to use CORS.
     RefPtr<SecurityOrigin> securityOrigin;
+    String contentSecurityPolicyNonce;
 };
 
 // Encode AtomicString (in FetchInitiatorInfo) as String to cross threads.
 struct CrossThreadResourceLoaderOptionsData {
     DISALLOW_NEW();
     explicit CrossThreadResourceLoaderOptionsData(const ResourceLoaderOptions& options)
         : dataBufferingPolicy(options.dataBufferingPolicy)
         , allowCredentials(options.allowCredentials)
         , credentialsRequested(options.credentialsRequested)
         , contentSecurityPolicyOption(options.contentSecurityPolicyOption)
         , initiatorInfo(options.initiatorInfo)
         , requestInitiatorContext(options.requestInitiatorContext)
         , synchronousPolicy(options.synchronousPolicy)
         , corsEnabled(options.corsEnabled)
-        , securityOrigin(options.securityOrigin ? options.securityOrigin->isolatedCopy() : nullptr) { }
+        , securityOrigin(options.securityOrigin ? options.securityOrigin->isolatedCopy() : nullptr)
+        , contentSecurityPolicyNonce(options.contentSecurityPolicyNonce)
+    {
+    }
 
     operator ResourceLoaderOptions() const
     {
         ResourceLoaderOptions options;
         options.dataBufferingPolicy = dataBufferingPolicy;
         options.allowCredentials = allowCredentials;
         options.credentialsRequested = credentialsRequested;
         options.contentSecurityPolicyOption = contentSecurityPolicyOption;
         options.initiatorInfo = initiatorInfo;
         options.requestInitiatorContext = requestInitiatorContext;
         options.synchronousPolicy = synchronousPolicy;
         options.corsEnabled = corsEnabled;
         options.securityOrigin = securityOrigin;
+        options.contentSecurityPolicyNonce = contentSecurityPolicyNonce;
         return options;
     }
 
     DataBufferingPolicy dataBufferingPolicy;
     StoredCredentials allowCredentials;
     CredentialRequest credentialsRequested;
     ContentSecurityPolicyDisposition contentSecurityPolicyOption;
     CrossThreadFetchInitiatorInfoData initiatorInfo;
     RequestInitiatorContext requestInitiatorContext;
     SynchronousPolicy synchronousPolicy;
     CORSEnabled corsEnabled;
     RefPtr<SecurityOrigin> securityOrigin;
+    String contentSecurityPolicyNonce;
 };
 
 template <>
 struct CrossThreadCopier<ResourceLoaderOptions> {
     using Type = CrossThreadResourceLoaderOptionsData;
     static Type copy(const ResourceLoaderOptions& options)
     {
         return CrossThreadResourceLoaderOptionsData(options);
     }
 };
 
 } // namespace blink
 
 #endif // ResourceLoaderOptions_h