Report nav timing 2 instance as soon as it's requested.

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/timing/Performance.h"
 
 #include "bindings/core/v8/PerformanceObserverCallback.h"
 #include "bindings/core/v8/V8BindingForTesting.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/testing/DummyPageHolder.h"
@@ skipping 44 matching lines @@
     m_pageHolder = DummyPageHolder::create(IntSize(800, 600));
     m_executionContext = new NullExecutionContext();
   }
 
   ExecutionContext* getExecutionContext() { return m_executionContext.get(); }
 
   int numPerformanceEntriesInObserver() {
     return m_observer->m_performanceEntries.size();
   }
 
-  PerformanceNavigationTiming::NavigationType getNavigationType(
-      NavigationType type,
-      Document* document) {
-    return PerformanceBase::getNavigationType(type, document);
-  }
-
   static bool allowsTimingRedirect(
       const Vector<ResourceResponse>& redirectChain,
       const ResourceResponse& finalResponse,
       const SecurityOrigin& initiatorSecurityOrigin,
       ExecutionContext* context) {
     return PerformanceBase::allowsTimingRedirect(
         redirectChain, finalResponse, initiatorSecurityOrigin, context);
   }
 
   Persistent<TestPerformanceBase> m_base;
@@ skipping 60 matching lines @@
   EXPECT_TRUE(m_base->hasPerformanceObserverFor(PerformanceEntry::LongTask));
   // Add a long task entry
   m_base->addLongTaskTiming(1234, 5678, "same-origin", "www.foo.com/bar", "",
                             "");
   EXPECT_EQ(1, numPerformanceEntriesInObserver());  // added an entry
 }
 
 TEST_F(PerformanceBaseTest, GetNavigationType) {
   m_pageHolder->page().setVisibilityState(PageVisibilityStatePrerender, false);
   PerformanceNavigationTiming::NavigationType returnedType =
-      getNavigationType(NavigationTypeBackForward, &m_pageHolder->document());
+      PerformanceBase::getNavigationType(NavigationTypeBackForward,
+                                         &m_pageHolder->document());
   EXPECT_EQ(returnedType,
             PerformanceNavigationTiming::NavigationType::Prerender);
 
   m_pageHolder->page().setVisibilityState(PageVisibilityStateHidden, false);
-  returnedType =
-      getNavigationType(NavigationTypeBackForward, &m_pageHolder->document());
+  returnedType = PerformanceBase::getNavigationType(NavigationTypeBackForward,
+                                                    &m_pageHolder->document());
   EXPECT_EQ(returnedType,
             PerformanceNavigationTiming::NavigationType::BackForward);
 
   m_pageHolder->page().setVisibilityState(PageVisibilityStateVisible, false);
-  returnedType = getNavigationType(NavigationTypeFormResubmitted,
-                                   &m_pageHolder->document());
+  returnedType = PerformanceBase::getNavigationType(
+      NavigationTypeFormResubmitted, &m_pageHolder->document());
   EXPECT_EQ(returnedType,
             PerformanceNavigationTiming::NavigationType::Navigate);
 }
 
 TEST_F(PerformanceBaseTest, AllowsTimingRedirect) {
   // When there are no cross-origin redirects.
   AtomicString originDomain = "http://127.0.0.1:8000";
   Vector<ResourceResponse> redirectChain;
   KURL url(ParsedURLString, originDomain + "/foo.html");
   ResourceResponse finalResponse;
-  finalResponse.setURL(url);
   ResourceResponse redirectResponse1;
   redirectResponse1.setURL(url);
   ResourceResponse redirectResponse2;
   redirectResponse2.setURL(url);
   redirectChain.push_back(redirectResponse1);
   redirectChain.push_back(redirectResponse2);
   RefPtr<SecurityOrigin> securityOrigin = SecurityOrigin::create(url);
+  // When finalResponse is an empty object.
+  EXPECT_FALSE(allowsTimingRedirect(redirectChain, finalResponse,
+                                    *securityOrigin.get(),
+                                    getExecutionContext()));
+  finalResponse.setURL(url);
   EXPECT_TRUE(allowsTimingRedirect(redirectChain, finalResponse,
                                    *securityOrigin.get(),
                                    getExecutionContext()));
   // When there exist cross-origin redirects.
   AtomicString crossOriginDomain = "http://126.0.0.1:8000";
   KURL redirectUrl(ParsedURLString, crossOriginDomain + "/bar.html");
   ResourceResponse redirectResponse3;
   redirectResponse3.setURL(redirectUrl);
   redirectChain.push_back(redirectResponse3);
   EXPECT_FALSE(allowsTimingRedirect(redirectChain, finalResponse,
                                     *securityOrigin.get(),
                                     getExecutionContext()));
 
   // When cross-origin redirect opts in.
   redirectChain.back().setHTTPHeaderField(HTTPNames::Timing_Allow_Origin,
                                           originDomain);
   EXPECT_TRUE(allowsTimingRedirect(redirectChain, finalResponse,
                                    *securityOrigin.get(),
                                    getExecutionContext()));
 }
 
 }  // namespace blink