nav timing 2 redirect allow opt-in

third_party/WebKit/Source/core/timing/PerformanceNavigationTiming.cpp

Index: third_party/WebKit/Source/core/timing/PerformanceNavigationTiming.cpp
diff --git a/third_party/WebKit/Source/core/timing/PerformanceNavigationTiming.cpp b/third_party/WebKit/Source/core/timing/PerformanceNavigationTiming.cpp
index b61a635a177790d3e1a52caa3ed9a55ff7990c9f..5580c3a3da2a2fb179b109fb7c53c791f276b118 100644
--- a/third_party/WebKit/Source/core/timing/PerformanceNavigationTiming.cpp
+++ b/third_party/WebKit/Source/core/timing/PerformanceNavigationTiming.cpp
@@ -36,7 +36,7 @@ PerformanceNavigationTiming::PerformanceNavigationTiming(
     double redirectEnd,
     double fetchStart,
     double responseEnd,
-    bool hasCrossOriginRedirect,
+    bool allowRedirectDetails,
     bool hasSameOriginAsPreviousDocument,
     ResourceLoadTiming* timing,
     double lastRedirectEndTime,
@@ -57,7 +57,7 @@ PerformanceNavigationTiming::PerformanceNavigationTiming(
                                 true /*allowTimingDetails*/,  // TODO(sunjian):
                                                               // Create an enum
                                                               // for this.
-                                !hasCrossOriginRedirect,
+                                allowRedirectDetails,
                                 "document",
                                 "navigation",
                                 timeOrigin),
@@ -76,19 +76,19 @@ PerformanceNavigationTiming::PerformanceNavigationTiming(
       m_redirectEnd(redirectEnd),
       m_fetchStart(fetchStart),
       m_responseEnd(responseEnd),
-      m_hasCrossOriginRedirect(hasCrossOriginRedirect),
+      m_allowRedirectDetails(allowRedirectDetails),
       m_hasSameOriginAsPreviousDocument(hasSameOriginAsPreviousDocument) {}
 
 PerformanceNavigationTiming::~PerformanceNavigationTiming() {}
 
 double PerformanceNavigationTiming::unloadEventStart() const {
-  if (m_hasCrossOriginRedirect || !m_hasSameOriginAsPreviousDocument)
+  if (!m_allowRedirectDetails || !m_hasSameOriginAsPreviousDocument)
     return 0;
   return monotonicTimeToDOMHighResTimeStamp(m_timeOrigin, m_unloadEventStart);
 }
 
 double PerformanceNavigationTiming::unloadEventEnd() const {
-  if (m_hasCrossOriginRedirect || !m_hasSameOriginAsPreviousDocument)
+  if (!m_allowRedirectDetails || !m_hasSameOriginAsPreviousDocument)
     return 0;
 
   return monotonicTimeToDOMHighResTimeStamp(m_timeOrigin, m_unloadEventEnd);
@@ -136,8 +136,7 @@ AtomicString PerformanceNavigationTiming::type() const {
 }
 
 unsigned short PerformanceNavigationTiming::redirectCount() const {
-  // TODO(sunjian): Also check response headers to allow opt-in crbugs/665160
-  if (m_hasCrossOriginRedirect)
+  if (!m_allowRedirectDetails)
     return 0;
   return m_redirectCount;
 }
@@ -147,13 +146,13 @@ double PerformanceNavigationTiming::fetchStart() const {
 }
 
 double PerformanceNavigationTiming::redirectStart() const {
-  if (m_hasCrossOriginRedirect)
+  if (!m_allowRedirectDetails)
     return 0;
   return monotonicTimeToDOMHighResTimeStamp(m_timeOrigin, m_redirectStart);
 }
 
 double PerformanceNavigationTiming::redirectEnd() const {
-  if (m_hasCrossOriginRedirect)
+  if (!m_allowRedirectDetails)
     return 0;
   return monotonicTimeToDOMHighResTimeStamp(m_timeOrigin, m_redirectEnd);
 }