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

third_party/WebKit/Source/core/timing/PerformanceBase.h

Index: third_party/WebKit/Source/core/timing/PerformanceBase.h
diff --git a/third_party/WebKit/Source/core/timing/PerformanceBase.h b/third_party/WebKit/Source/core/timing/PerformanceBase.h
index a5521b09c3fb1ba59c9d4a597f8f2f1f1aadb961..dc1f0aa1774024a4feb8dc2d1fb5ac3542ec7b25 100644
--- a/third_party/WebKit/Source/core/timing/PerformanceBase.h
+++ b/third_party/WebKit/Source/core/timing/PerformanceBase.h
@@ -49,7 +49,6 @@
 namespace blink {
 
 class ExceptionState;
-class LocalFrame;
 class PerformanceObserver;
 class PerformanceTiming;
 class ResourceResponse;
@@ -61,7 +60,6 @@ using PerformanceEntryVector = HeapVector<Member<PerformanceEntry>>;
 using PerformanceObservers = HeapListHashSet<Member<PerformanceObserver>>;
 
 class CORE_EXPORT PerformanceBase : public EventTargetWithInlineData {
-  friend class PerformanceBaseTest;
 
  public:
   ~PerformanceBase() override;
@@ -89,7 +87,7 @@ class CORE_EXPORT PerformanceBase : public EventTargetWithInlineData {
 
   double timeOrigin() const { return m_timeOrigin; }
 
-  PerformanceEntryVector getEntries() const;
+  PerformanceEntryVector getEntries();
   PerformanceEntryVector getEntriesByType(const String& entryType);
   PerformanceEntryVector getEntriesByName(const String& name,
                                           const String& entryType);
@@ -113,7 +111,7 @@ class CORE_EXPORT PerformanceBase : public EventTargetWithInlineData {
 
   void addResourceTiming(const ResourceTimingInfo&);
 
-  void addNavigationTiming(LocalFrame*);
+  void notifyNavigationTimingToObservers();
 
   void addFirstPaintTiming(double startTime);
 
@@ -134,18 +132,18 @@ class CORE_EXPORT PerformanceBase : public EventTargetWithInlineData {
   void activateObserver(PerformanceObserver&);
   void resumeSuspendedObservers();
 
-  DECLARE_VIRTUAL_TRACE();
+  static bool allowsTimingRedirect(const Vector<ResourceResponse>&,
+                                   const ResourceResponse&,
+                                   const SecurityOrigin&,
+                                   ExecutionContext*);
 
- private:
   static PerformanceNavigationTiming::NavigationType getNavigationType(
       NavigationType,
       const Document*);
 
-  static bool allowsTimingRedirect(const Vector<ResourceResponse>&,
-                                   const ResourceResponse&,
-                                   const SecurityOrigin&,
-                                   ExecutionContext*);
+  DECLARE_VIRTUAL_TRACE();
 
+ private:
   static bool passesTimingAllowCheck(const ResourceResponse&,
                                      const SecurityOrigin&,
                                      const AtomicString&,
@@ -156,6 +154,12 @@ class CORE_EXPORT PerformanceBase : public EventTargetWithInlineData {
  protected:
   explicit PerformanceBase(double timeOrigin, RefPtr<WebTaskRunner>);
 
+  // Expect Performance to override this method,
+  // WorkerPerformance doesn't have to override this.
+  virtual PerformanceNavigationTiming* createNavigationTimingInstance() {
+    return nullptr;
+  }
+
   bool isResourceTimingBufferFull();
   void addResourceTimingBuffer(PerformanceEntry&);