Move 'ContentSecurityPolicy::RedirectStatus' into 'ResourceRequest'

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

 /*
  * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 57 matching lines @@
     setFetchRequestMode(data->m_fetchRequestMode);
     setFetchCredentialsMode(data->m_fetchCredentialsMode);
     setFetchRedirectMode(data->m_fetchRedirectMode);
     setLoFiState(data->m_loFiState);
     m_referrerPolicy = data->m_referrerPolicy;
     m_didSetHTTPReferrer = data->m_didSetHTTPReferrer;
     m_checkForBrowserSideNavigation = data->m_checkForBrowserSideNavigation;
     m_uiStartTime = data->m_uiStartTime;
     m_isExternalRequest = data->m_isExternalRequest;
     m_inputPerfMetricReportPolicy = data->m_inputPerfMetricReportPolicy;
-    m_followedRedirect = data->m_followedRedirect;
+    m_redirectStatus = data->m_redirectStatus;
 }
 
 PassOwnPtr<CrossThreadResourceRequestData> ResourceRequest::copyData() const
 {
     OwnPtr<CrossThreadResourceRequestData> data = adoptPtr(new CrossThreadResourceRequestData());
     data->m_url = url().copy();
     data->m_cachePolicy = getCachePolicy();
     data->m_timeoutInterval = timeoutInterval();
     data->m_firstPartyForCookies = firstPartyForCookies().copy();
     data->m_requestorOrigin = requestorOrigin() ? requestorOrigin()->isolatedCopy() : nullptr;
@@ skipping 21 matching lines @@
     data->m_fetchRequestMode = m_fetchRequestMode;
     data->m_fetchCredentialsMode = m_fetchCredentialsMode;
     data->m_fetchRedirectMode = m_fetchRedirectMode;
     data->m_loFiState = m_loFiState;
     data->m_referrerPolicy = m_referrerPolicy;
     data->m_didSetHTTPReferrer = m_didSetHTTPReferrer;
     data->m_checkForBrowserSideNavigation = m_checkForBrowserSideNavigation;
     data->m_uiStartTime = m_uiStartTime;
     data->m_isExternalRequest = m_isExternalRequest;
     data->m_inputPerfMetricReportPolicy = m_inputPerfMetricReportPolicy;
-    data->m_followedRedirect = m_followedRedirect;
+    data->m_redirectStatus = m_redirectStatus;
     return data;
 }
 
 bool ResourceRequest::isEmpty() const
 {
     return m_url.isEmpty();
 }
 
 bool ResourceRequest::isNull() const
 {
@@ skipping 288 matching lines @@
     m_fetchRequestMode = WebURLRequest::FetchRequestModeNoCORS;
     m_fetchCredentialsMode = WebURLRequest::FetchCredentialsModeInclude;
     m_fetchRedirectMode = WebURLRequest::FetchRedirectModeFollow;
     m_referrerPolicy = ReferrerPolicyDefault;
     m_loFiState = WebURLRequest::LoFiUnspecified;
     m_didSetHTTPReferrer = false;
     m_checkForBrowserSideNavigation = true;
     m_uiStartTime = 0;
     m_isExternalRequest = false;
     m_inputPerfMetricReportPolicy = InputToLoadPerfMetricReportPolicy::NoReport;
-    m_followedRedirect = false;
+    m_redirectStatus = RedirectStatus::NoRedirect;
     m_requestorOrigin = SecurityOrigin::createUnique();
 }
 
 } // namespace blink