Move 'ContentSecurityPolicy::RedirectStatus' into 'ResourceRequest'

third_party/WebKit/Source/platform/network/ResourceRequest.h

 /*
  * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
  * Copyright (C) 2009, 2012 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 47 matching lines @@
     NoReport, // Don't report metrics for this ResourceRequest.
     ReportLink, // Report metrics for this request as initiated by a link click.
     ReportIntent, // Report metrics for this request as initiated by an intent.
 };
 
 struct CrossThreadResourceRequestData;
 
 class PLATFORM_EXPORT ResourceRequest final {
     DISALLOW_NEW();
 public:
+    enum class RedirectStatus { FollowedRedirect, NoRedirect };
+
     class ExtraData : public RefCounted<ExtraData> {
     public:
         virtual ~ExtraData() { }
     };
 
     ResourceRequest()
     {
         initialize(KURL());
     }
 
@@ skipping 156 matching lines @@
     double uiStartTime() const { return m_uiStartTime; }
     void setUIStartTime(double uiStartTime) { m_uiStartTime = uiStartTime; }
 
     // https://mikewest.github.io/cors-rfc1918/#external-request
     bool isExternalRequest() const { return m_isExternalRequest; }
     void setExternalRequestStateFromRequestorAddressSpace(WebAddressSpace);
 
     InputToLoadPerfMetricReportPolicy inputPerfMetricReportPolicy() const { return m_inputPerfMetricReportPolicy; }
     void setInputPerfMetricReportPolicy(InputToLoadPerfMetricReportPolicy inputPerfMetricReportPolicy) { m_inputPerfMetricReportPolicy = inputPerfMetricReportPolicy; }
 
-    void setFollowedRedirect(bool followed) { m_followedRedirect = followed; }
-    bool followedRedirect() const { return m_followedRedirect; }
+    void setRedirectStatus(RedirectStatus status) { m_redirectStatus = status; }
+    RedirectStatus redirectStatus() const { return m_redirectStatus; }
 
 private:
     void initialize(const KURL&);
 
     const CacheControlHeader& cacheControlHeader() const;
 
     KURL m_url;
     WebCachePolicy m_cachePolicy;
     double m_timeoutInterval; // 0 is a magic value for platform default on platforms that have one.
     KURL m_firstPartyForCookies;
@@ skipping 26 matching lines @@
     bool m_didSetHTTPReferrer;
     bool m_checkForBrowserSideNavigation;
     double m_uiStartTime;
     bool m_isExternalRequest;
     InputToLoadPerfMetricReportPolicy m_inputPerfMetricReportPolicy;
 
     mutable CacheControlHeader m_cacheControlHeaderCache;
 
     static double s_defaultTimeoutInterval;
 
-    bool m_followedRedirect;
+    RedirectStatus m_redirectStatus;
 };
 
 struct CrossThreadResourceRequestData {
     WTF_MAKE_NONCOPYABLE(CrossThreadResourceRequestData); USING_FAST_MALLOC(CrossThreadResourceRequestData);
 public:
     CrossThreadResourceRequestData() { }
     KURL m_url;
 
     WebCachePolicy m_cachePolicy;
     double m_timeoutInterval;
@@ skipping 21 matching lines @@
     WebURLRequest::FetchRequestMode m_fetchRequestMode;
     WebURLRequest::FetchCredentialsMode m_fetchCredentialsMode;
     WebURLRequest::FetchRedirectMode m_fetchRedirectMode;
     WebURLRequest::LoFiState m_loFiState;
     ReferrerPolicy m_referrerPolicy;
     bool m_didSetHTTPReferrer;
     bool m_checkForBrowserSideNavigation;
     double m_uiStartTime;
     bool m_isExternalRequest;
     InputToLoadPerfMetricReportPolicy m_inputPerfMetricReportPolicy;
-    bool m_followedRedirect;
+    ResourceRequest::RedirectStatus m_redirectStatus;
 };
 
 } // namespace blink
 
 #endif // ResourceRequest_h