Rename PerformanceBase to Performance

This CL is the second step in merging the Performance and WorkerPerformance idls.
The following are the full set of steps:
1. Rename Performance.h to WindowPerformance.h.
2. Rename PerformanceBase.h to Performance.h.
3. Merge Performance.idl and WorkerPerformance.idl.

The following is roughly how it would look like after all steps are completed:
https://chromium-review.googlesource.com/c/chromium/src/+/919983


Bug: 707392
Change-Id: I1d9d91b29be2910d5a733e685bbccea9180d1d67
Reviewed-on: https://chromium-review.googlesource.com/924276
Commit-Queue: Nicolás Peña Moreno <npm@chromium.org>
Reviewed-by: Timothy Dresser <tdresser@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537535}

third_party/WebKit/Source/core/BUILD.gn

@@ -2093,10 +2093,10 @@ jumbo_source_set("unit_tests") {
     "testing/sim/SimWebViewClient.cpp",
     "testing/sim/SimWebViewClient.h",
     "timing/MemoryInfoTest.cpp",
-    "timing/PerformanceBaseTest.cpp",
     "timing/PerformanceNavigationTimingTest.cpp",
     "timing/PerformanceObserverTest.cpp",
     "timing/PerformanceResourceTimingTest.cpp",
+    "timing/PerformanceTest.cpp",
     "timing/WindowPerformanceTest.cpp",
     "url/URLSearchParamsTest.cpp",
     "workers/DedicatedWorkerTest.cpp",

third_party/WebKit/Source/core/dom/IdleDeadline.cpp

@@ -4,7 +4,7 @@
 
 #include "core/dom/IdleDeadline.h"
 
-#include "core/timing/PerformanceBase.h"
+#include "core/timing/Performance.h"
 #include "platform/scheduler/child/web_scheduler.h"
 #include "platform/wtf/Time.h"
 #include "public/platform/Platform.h"
@@ -25,7 +25,7 @@ double IdleDeadline::timeRemaining() const {
     return 0;
   }
 
-  return 1000.0 * PerformanceBase::ClampTimeResolution(time_remaining);
+  return 1000.0 * Performance::ClampTimeResolution(time_remaining);
 }
 
 }  // namespace blink

third_party/WebKit/Source/core/frame/RemoteFrameOwner.cpp

@@ -7,7 +7,7 @@
 #include "core/frame/LocalFrame.h"
 #include "core/frame/LocalFrameClient.h"
 #include "core/frame/WebLocalFrameImpl.h"
-#include "core/timing/PerformanceBase.h"
+#include "core/timing/Performance.h"
 #include "public/platform/WebResourceTimingInfo.h"
 #include "public/web/WebFrameClient.h"
 
@@ -51,10 +51,9 @@ void RemoteFrameOwner::ClearContentFrame() {
 
 void RemoteFrameOwner::AddResourceTiming(const ResourceTimingInfo& info) {
   LocalFrame* frame = ToLocalFrame(frame_);
-  WebResourceTimingInfo resource_timing =
-      PerformanceBase::GenerateResourceTiming(
-          *frame->Tree().Parent()->GetSecurityContext()->GetSecurityOrigin(),
-          info, *frame->GetDocument());
+  WebResourceTimingInfo resource_timing = Performance::GenerateResourceTiming(
+      *frame->Tree().Parent()->GetSecurityContext()->GetSecurityOrigin(), info,
+      *frame->GetDocument());
   frame->Client()->ForwardResourceTimingToParent(resource_timing);
 }
 

third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

@@ -65,7 +65,7 @@
 #include "core/probe/CoreProbes.h"
 #include "core/svg/graphics/SVGImageChromeClient.h"
 #include "core/timing/DOMWindowPerformance.h"
-#include "core/timing/PerformanceBase.h"
+#include "core/timing/Performance.h"
 #include "core/timing/WindowPerformance.h"
 #include "platform/Histogram.h"
 #include "platform/WebFrameScheduler.h"

third_party/WebKit/Source/core/timing/BUILD.gn

@@ -10,8 +10,8 @@ blink_core_sources("timing") {
     "DOMWindowPerformance.h",
     "MemoryInfo.cpp",
     "MemoryInfo.h",
-    "PerformanceBase.cpp",
-    "PerformanceBase.h",
+    "Performance.cpp",
+    "Performance.h",
     "PerformanceEntry.cpp",
     "PerformanceEntry.h",
     "PerformanceLongTaskTiming.cpp",

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

@@ -29,8 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef PerformanceBase_h
-#define PerformanceBase_h
+#ifndef Performance_h
+#define Performance_h
 
 #include "core/CoreExport.h"
 #include "core/dom/DOMHighResTimeStamp.h"
@@ -65,10 +65,9 @@ class V8ObjectBuilder;
 
 using PerformanceEntryVector = HeapVector<Member<PerformanceEntry>>;
 
-class CORE_EXPORT PerformanceBase : public EventTargetWithInlineData {
-
+class CORE_EXPORT Performance : public EventTargetWithInlineData {
  public:
-  ~PerformanceBase() override;
+  ~Performance() override;
 
   const AtomicString& InterfaceName() const override;
 
@@ -226,8 +225,8 @@ class CORE_EXPORT PerformanceBase : public EventTargetWithInlineData {
   void AddPaintTiming(PerformancePaintTiming::PaintType, TimeTicks start_time);
 
  protected:
-  PerformanceBase(TimeTicks time_origin,
-                  scoped_refptr<base::SingleThreadTaskRunner>);
+  Performance(TimeTicks time_origin,
+              scoped_refptr<base::SingleThreadTaskRunner>);
 
   // Expect Performance to override this method,
   // WorkerPerformance doesn't have to override this.
@@ -261,9 +260,9 @@ class CORE_EXPORT PerformanceBase : public EventTargetWithInlineData {
   HeapLinkedHashSet<TraceWrapperMember<PerformanceObserver>> observers_;
   HeapLinkedHashSet<Member<PerformanceObserver>> active_observers_;
   HeapLinkedHashSet<Member<PerformanceObserver>> suspended_observers_;
-  TaskRunnerTimer<PerformanceBase> deliver_observations_timer_;
+  TaskRunnerTimer<Performance> deliver_observations_timer_;
 };
 
 }  // namespace blink
 
-#endif  // PerformanceBase_h
+#endif  // Performance_h

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

@@ -10,7 +10,7 @@
 #include "core/frame/LocalFrame.h"
 #include "core/loader/DocumentLoadTiming.h"
 #include "core/loader/DocumentLoader.h"
-#include "core/timing/PerformanceBase.h"
+#include "core/timing/Performance.h"
 #include "platform/loader/fetch/ResourceTimingInfo.h"
 #include "third_party/WebKit/common/page/page_visibility_state.mojom-blink.h"
 
@@ -121,7 +121,7 @@ bool PerformanceNavigationTiming::GetAllowRedirectDetails() const {
     return false;
   // TODO(sunjian): Think about how to make this flag deterministic.
   // crbug/693183.
-  return PerformanceBase::AllowsTimingRedirect(
+  return Performance::AllowsTimingRedirect(
       resource_timing_info_->RedirectChain(),
       resource_timing_info_->FinalResponse(), *security_origin, context);
 }
@@ -141,7 +141,7 @@ DOMHighResTimeStamp PerformanceNavigationTiming::unloadEventStart() const {
   if (!allow_redirect_details || !timing ||
       !timing->HasSameOriginAsPreviousDocument())
     return 0;
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       TimeOrigin(), timing->UnloadEventStart(),
       false /* allow_negative_value */);
 }
@@ -153,7 +153,7 @@ DOMHighResTimeStamp PerformanceNavigationTiming::unloadEventEnd() const {
   if (!allow_redirect_details || !timing ||
       !timing->HasSameOriginAsPreviousDocument())
     return 0;
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       TimeOrigin(), timing->UnloadEventEnd(), false /* allow_negative_value */);
 }
 
@@ -161,7 +161,7 @@ DOMHighResTimeStamp PerformanceNavigationTiming::domInteractive() const {
   const DocumentTiming* timing = GetDocumentTiming();
   if (!timing)
     return 0.0;
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       TimeOrigin(), timing->DomInteractive(), false /* allow_negative_value */);
 }
 
@@ -170,7 +170,7 @@ DOMHighResTimeStamp PerformanceNavigationTiming::domContentLoadedEventStart()
   const DocumentTiming* timing = GetDocumentTiming();
   if (!timing)
     return 0.0;
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       TimeOrigin(), timing->DomContentLoadedEventStart(),
       false /* allow_negative_value */);
 }
@@ -180,7 +180,7 @@ DOMHighResTimeStamp PerformanceNavigationTiming::domContentLoadedEventEnd()
   const DocumentTiming* timing = GetDocumentTiming();
   if (!timing)
     return 0.0;
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       TimeOrigin(), timing->DomContentLoadedEventEnd(),
       false /* allow_negative_value */);
 }
@@ -189,7 +189,7 @@ DOMHighResTimeStamp PerformanceNavigationTiming::domComplete() const {
   const DocumentTiming* timing = GetDocumentTiming();
   if (!timing)
     return 0.0;
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       TimeOrigin(), timing->DomComplete(), false /* allow_negative_value */);
 }
 
@@ -197,7 +197,7 @@ DOMHighResTimeStamp PerformanceNavigationTiming::loadEventStart() const {
   DocumentLoadTiming* timing = GetDocumentLoadTiming();
   if (!timing)
     return 0.0;
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       TimeOrigin(), timing->LoadEventStart(), false /* allow_negative_value */);
 }
 
@@ -205,7 +205,7 @@ DOMHighResTimeStamp PerformanceNavigationTiming::loadEventEnd() const {
   DocumentLoadTiming* timing = GetDocumentLoadTiming();
   if (!timing)
     return 0.0;
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       TimeOrigin(), timing->LoadEventEnd(), false /* allow_negative_value */);
 }
 
@@ -230,7 +230,7 @@ DOMHighResTimeStamp PerformanceNavigationTiming::redirectStart() const {
   DocumentLoadTiming* timing = GetDocumentLoadTiming();
   if (!allow_redirect_details || !timing)
     return 0;
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       TimeOrigin(), timing->RedirectStart(), false /* allow_negative_value */);
 }
 
@@ -239,7 +239,7 @@ DOMHighResTimeStamp PerformanceNavigationTiming::redirectEnd() const {
   DocumentLoadTiming* timing = GetDocumentLoadTiming();
   if (!allow_redirect_details || !timing)
     return 0;
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       TimeOrigin(), timing->RedirectEnd(), false /* allow_negative_value */);
 }
 
@@ -247,7 +247,7 @@ DOMHighResTimeStamp PerformanceNavigationTiming::fetchStart() const {
   DocumentLoadTiming* timing = GetDocumentLoadTiming();
   if (!timing)
     return 0.0;
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       TimeOrigin(), timing->FetchStart(), false /* allow_negative_value */);
 }
 
@@ -255,7 +255,7 @@ DOMHighResTimeStamp PerformanceNavigationTiming::responseEnd() const {
   DocumentLoadTiming* timing = GetDocumentLoadTiming();
   if (!timing)
     return 0.0;
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       TimeOrigin(), timing->ResponseEnd(), false /* allow_negative_value */);
 }
 

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

@@ -50,7 +50,7 @@ PerformanceObserver* PerformanceObserver::Create(
 
 PerformanceObserver::PerformanceObserver(
     ExecutionContext* execution_context,
-    PerformanceBase* performance,
+    Performance* performance,
     V8PerformanceObserverCallback* callback)
     : ContextClient(execution_context),
       execution_context_(execution_context),

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

@@ -17,7 +17,7 @@ namespace blink {
 
 class ExecutionContext;
 class ExceptionState;
-class PerformanceBase;
+class Performance;
 class PerformanceObserver;
 class PerformanceObserverInit;
 class V8PerformanceObserverCallback;
@@ -30,8 +30,8 @@ class CORE_EXPORT PerformanceObserver final
       public ContextClient {
   DEFINE_WRAPPERTYPEINFO();
   USING_GARBAGE_COLLECTED_MIXIN(PerformanceObserver);
-  friend class PerformanceBase;
-  friend class PerformanceBaseTest;
+  friend class Performance;
+  friend class PerformanceTest;
   friend class PerformanceObserverTest;
 
  public:
@@ -53,14 +53,14 @@ class CORE_EXPORT PerformanceObserver final
 
  private:
   PerformanceObserver(ExecutionContext*,
-                      PerformanceBase*,
+                      Performance*,
                       V8PerformanceObserverCallback*);
   void Deliver();
   bool ShouldBeSuspended() const;
 
   Member<ExecutionContext> execution_context_;
   TraceWrapperMember<V8PerformanceObserverCallback> callback_;
-  WeakMember<PerformanceBase> performance_;
+  WeakMember<Performance> performance_;
   PerformanceEntryVector performance_entries_;
   PerformanceEntryTypeMask filter_options_;
   bool is_registered_;

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

@@ -7,7 +7,7 @@
 #include "bindings/core/v8/V8BindingForTesting.h"
 #include "bindings/core/v8/v8_performance_observer_callback.h"
 #include "core/dom/ExecutionContext.h"
-#include "core/timing/PerformanceBase.h"
+#include "core/timing/Performance.h"
 #include "core/timing/PerformanceMark.h"
 #include "core/timing/PerformanceObserverInit.h"
 #include "core/timing/WindowPerformance.h"
@@ -17,13 +17,13 @@
 
 namespace blink {
 
-class MockPerformanceBase : public PerformanceBase {
+class MockPerformance : public Performance {
  public:
-  explicit MockPerformanceBase(ScriptState* script_state)
-      : PerformanceBase(TimeTicks(),
-                        ExecutionContext::From(script_state)
-                            ->GetTaskRunner(TaskType::kPerformanceTimeline)) {}
-  ~MockPerformanceBase() = default;
+  explicit MockPerformance(ScriptState* script_state)
+      : Performance(TimeTicks(),
+                    ExecutionContext::From(script_state)
+                        ->GetTaskRunner(TaskType::kPerformanceTimeline)) {}
+  ~MockPerformance() = default;
 
   ExecutionContext* GetExecutionContext() const override { return nullptr; }
 };
@@ -33,7 +33,7 @@ class PerformanceObserverTest : public ::testing::Test {
   void Initialize(ScriptState* script_state) {
     v8::Local<v8::Function> callback =
         v8::Function::New(script_state->GetContext(), nullptr).ToLocalChecked();
-    base_ = new MockPerformanceBase(script_state);
+    base_ = new MockPerformance(script_state);
     cb_ = V8PerformanceObserverCallback::Create(callback);
     observer_ = new PerformanceObserver(ExecutionContext::From(script_state),
                                         base_, cb_);
@@ -43,7 +43,7 @@ class PerformanceObserverTest : public ::testing::Test {
   int NumPerformanceEntries() { return observer_->performance_entries_.size(); }
   void Deliver() { observer_->Deliver(); }
 
-  Persistent<MockPerformanceBase> base_;
+  Persistent<MockPerformance> base_;
   Persistent<V8PerformanceObserverCallback> cb_;
   Persistent<PerformanceObserver> observer_;
 };

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

@@ -32,7 +32,7 @@
 #include "core/timing/PerformanceResourceTiming.h"
 
 #include "bindings/core/v8/V8ObjectBuilder.h"
-#include "core/timing/PerformanceBase.h"
+#include "core/timing/Performance.h"
 #include "platform/loader/fetch/ResourceRequest.h"
 #include "platform/loader/fetch/ResourceResponse.h"
 #include "platform/loader/fetch/ResourceTimingInfo.h"
@@ -46,11 +46,11 @@ PerformanceResourceTiming::PerformanceResourceTiming(
     const AtomicString& initiator_type)
     : PerformanceEntry(info.name,
                        "resource",
-                       PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+                       Performance::MonotonicTimeToDOMHighResTimeStamp(
                            time_origin,
                            TimeTicksFromSeconds(info.start_time),
                            info.allow_negative_values),
-                       PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+                       Performance::MonotonicTimeToDOMHighResTimeStamp(
                            time_origin,
                            TimeTicksFromSeconds(info.finish_time),
                            info.allow_negative_values)),
@@ -151,7 +151,7 @@ DOMHighResTimeStamp PerformanceResourceTiming::workerStart() const {
   if (!timing || timing->WorkerStart().is_null())
     return 0.0;
 
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       time_origin_, timing->WorkerStart(), allow_negative_value_);
 }
 
@@ -160,7 +160,7 @@ DOMHighResTimeStamp PerformanceResourceTiming::WorkerReady() const {
   if (!timing || timing->WorkerReady().is_null())
     return 0.0;
 
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       time_origin_, timing->WorkerReady(), allow_negative_value_);
 }
 
@@ -178,7 +178,7 @@ DOMHighResTimeStamp PerformanceResourceTiming::redirectEnd() const {
   if (last_redirect_end_time_.is_null() || !allow_redirect_details_)
     return 0.0;
 
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       time_origin_, last_redirect_end_time_, allow_negative_value_);
 }
 
@@ -188,7 +188,7 @@ DOMHighResTimeStamp PerformanceResourceTiming::fetchStart() const {
     return PerformanceEntry::startTime();
 
   if (!last_redirect_end_time_.is_null()) {
-    return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+    return Performance::MonotonicTimeToDOMHighResTimeStamp(
         time_origin_, timing->RequestTime(), allow_negative_value_);
   }
 
@@ -205,7 +205,7 @@ DOMHighResTimeStamp PerformanceResourceTiming::domainLookupStart() const {
   if (!timing || timing->DnsStart().is_null())
     return fetchStart();
 
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       time_origin_, timing->DnsStart(), allow_negative_value_);
 }
 
@@ -216,7 +216,7 @@ DOMHighResTimeStamp PerformanceResourceTiming::domainLookupEnd() const {
   if (!timing || timing->DnsEnd().is_null())
     return domainLookupStart();
 
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       time_origin_, timing->DnsEnd(), allow_negative_value_);
 }
 
@@ -233,7 +233,7 @@ DOMHighResTimeStamp PerformanceResourceTiming::connectStart() const {
   if (!timing->DnsEnd().is_null())
     connect_start = timing->DnsEnd();
 
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       time_origin_, connect_start, allow_negative_value_);
 }
 
@@ -245,7 +245,7 @@ DOMHighResTimeStamp PerformanceResourceTiming::connectEnd() const {
   if (!timing || timing->ConnectEnd().is_null() || DidReuseConnection())
     return connectStart();
 
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       time_origin_, timing->ConnectEnd(), allow_negative_value_);
 }
 
@@ -257,7 +257,7 @@ DOMHighResTimeStamp PerformanceResourceTiming::secureConnectionStart() const {
   if (!timing || timing->SslStart().is_null())
     return 0.0;
 
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       time_origin_, timing->SslStart(), allow_negative_value_);
 }
 
@@ -268,7 +268,7 @@ DOMHighResTimeStamp PerformanceResourceTiming::requestStart() const {
   if (!timing)
     return connectEnd();
 
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       time_origin_, timing->SendStart(), allow_negative_value_);
 }
 
@@ -281,7 +281,7 @@ DOMHighResTimeStamp PerformanceResourceTiming::responseStart() const {
 
   // FIXME: This number isn't exactly correct. See the notes in
   // PerformanceTiming::responseStart().
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       time_origin_, timing->ReceiveHeadersEnd(), allow_negative_value_);
 }
 
@@ -289,7 +289,7 @@ DOMHighResTimeStamp PerformanceResourceTiming::responseEnd() const {
   if (finish_time_.is_null())
     return responseStart();
 
-  return PerformanceBase::MonotonicTimeToDOMHighResTimeStamp(
+  return Performance::MonotonicTimeToDOMHighResTimeStamp(
       time_origin_, finish_time_, allow_negative_value_);
 }
 

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

@@ -9,7 +9,7 @@
 #include "core/dom/ExecutionContext.h"
 #include "core/testing/DummyPageHolder.h"
 #include "core/testing/NullExecutionContext.h"
-#include "core/timing/PerformanceBase.h"
+#include "core/timing/Performance.h"
 #include "core/timing/PerformanceLongTaskTiming.h"
 #include "core/timing/PerformanceObserver.h"
 #include "core/timing/PerformanceObserverInit.h"
@@ -19,13 +19,13 @@
 
 namespace blink {
 
-class TestPerformanceBase : public PerformanceBase {
+class TestPerformance : public Performance {
  public:
-  explicit TestPerformanceBase(ScriptState* script_state)
-      : PerformanceBase(TimeTicks(),
-                        ExecutionContext::From(script_state)
-                            ->GetTaskRunner(TaskType::kPerformanceTimeline)) {}
-  ~TestPerformanceBase() = default;
+  explicit TestPerformance(ScriptState* script_state)
+      : Performance(TimeTicks(),
+                    ExecutionContext::From(script_state)
+                        ->GetTaskRunner(TaskType::kPerformanceTimeline)) {}
+  ~TestPerformance() = default;
 
   ExecutionContext* GetExecutionContext() const override { return nullptr; }
 
@@ -37,15 +37,15 @@ class TestPerformanceBase : public PerformanceBase {
     return HasObserverFor(entry_type);
   }
 
-  void Trace(blink::Visitor* visitor) { PerformanceBase::Trace(visitor); }
+  void Trace(blink::Visitor* visitor) { Performance::Trace(visitor); }
 };
 
-class PerformanceBaseTest : public ::testing::Test {
+class PerformanceTest : public ::testing::Test {
  protected:
   void Initialize(ScriptState* script_state) {
     v8::Local<v8::Function> callback =
         v8::Function::New(script_state->GetContext(), nullptr).ToLocalChecked();
-    base_ = new TestPerformanceBase(script_state);
+    base_ = new TestPerformance(script_state);
     cb_ = V8PerformanceObserverCallback::Create(callback);
     observer_ = new PerformanceObserver(ExecutionContext::From(script_state),
                                         base_, cb_);
@@ -67,18 +67,18 @@ class PerformanceBaseTest : public ::testing::Test {
       const ResourceResponse& final_response,
       const SecurityOrigin& initiator_security_origin,
       ExecutionContext* context) {
-    return PerformanceBase::AllowsTimingRedirect(
+    return Performance::AllowsTimingRedirect(
         redirect_chain, final_response, initiator_security_origin, context);
   }
 
-  Persistent<TestPerformanceBase> base_;
+  Persistent<TestPerformance> base_;
   Persistent<ExecutionContext> execution_context_;
   Persistent<PerformanceObserver> observer_;
   std::unique_ptr<DummyPageHolder> page_holder_;
   Persistent<V8PerformanceObserverCallback> cb_;
 };
 
-TEST_F(PerformanceBaseTest, Register) {
+TEST_F(PerformanceTest, Register) {
   V8TestingScope scope;
   Initialize(scope.GetScriptState());
 
@@ -94,7 +94,7 @@ TEST_F(PerformanceBaseTest, Register) {
   EXPECT_EQ(0, base_->NumActiveObservers());
 }
 
-TEST_F(PerformanceBaseTest, Activate) {
+TEST_F(PerformanceTest, Activate) {
   V8TestingScope scope;
   Initialize(scope.GetScriptState());
 
@@ -114,7 +114,7 @@ TEST_F(PerformanceBaseTest, Activate) {
   EXPECT_EQ(1, base_->NumActiveObservers());
 }
 
-TEST_F(PerformanceBaseTest, AddLongTaskTiming) {
+TEST_F(PerformanceTest, AddLongTaskTiming) {
   V8TestingScope scope;
   Initialize(scope.GetScriptState());
   SubTaskAttribution::EntriesVector sub_task_attributions;
@@ -142,7 +142,7 @@ TEST_F(PerformanceBaseTest, AddLongTaskTiming) {
   EXPECT_EQ(1, NumPerformanceEntriesInObserver());  // added an entry
 }
 
-TEST_F(PerformanceBaseTest, AllowsTimingRedirect) {
+TEST_F(PerformanceTest, AllowsTimingRedirect) {
   // When there are no cross-origin redirects.
   AtomicString origin_domain = "http://127.0.0.1:8000";
   Vector<ResourceResponse> redirect_chain;

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

@@ -42,7 +42,7 @@
 #include "core/loader/FrameLoader.h"
 #include "core/loader/InteractiveDetector.h"
 #include "core/paint/PaintTiming.h"
-#include "core/timing/PerformanceBase.h"
+#include "core/timing/Performance.h"
 #include "platform/loader/fetch/ResourceLoadTiming.h"
 #include "platform/loader/fetch/ResourceResponse.h"
 
@@ -51,7 +51,7 @@ namespace blink {
 
 static unsigned long long ToIntegerMilliseconds(double seconds) {
   DCHECK_GE(seconds, 0);
-  double clamped_seconds = PerformanceBase::ClampTimeResolution(seconds);
+  double clamped_seconds = Performance::ClampTimeResolution(seconds);
   return static_cast<unsigned long long>(clamped_seconds * 1000.0);
 }
 

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

@@ -27,7 +27,7 @@
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
-#include "core/timing/PerformanceBase.h"
+#include "core/timing/Performance.h"
 #include "core/timing/PerformanceMark.h"
 #include "core/timing/PerformanceMeasure.h"
 #include "platform/Histogram.h"
@@ -74,8 +74,7 @@ const RestrictedKeyMap& GetRestrictedKeyMap() {
 
 }  // namespace
 
-UserTiming::UserTiming(PerformanceBase& performance)
-    : performance_(&performance) {}
+UserTiming::UserTiming(Performance& performance) : performance_(&performance) {}
 
 static void InsertPerformanceEntry(PerformanceEntryMap& performance_entry_map,
                                    PerformanceEntry& entry) {

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

@@ -26,7 +26,7 @@
 #ifndef PerformanceUserTiming_h
 #define PerformanceUserTiming_h
 
-#include "core/timing/PerformanceBase.h"
+#include "core/timing/Performance.h"
 #include "core/timing/PerformanceTiming.h"
 #include "platform/heap/Handle.h"
 #include "platform/wtf/text/WTFString.h"
@@ -34,7 +34,7 @@
 namespace blink {
 
 class ExceptionState;
-class PerformanceBase;
+class Performance;
 
 typedef unsigned long long (
     PerformanceTiming::*NavigationTimingFunction)() const;
@@ -42,7 +42,7 @@ using PerformanceEntryMap = HeapHashMap<String, PerformanceEntryVector>;
 
 class UserTiming final : public GarbageCollected<UserTiming> {
  public:
-  static UserTiming* Create(PerformanceBase& performance) {
+  static UserTiming* Create(Performance& performance) {
     return new UserTiming(performance);
   }
 
@@ -68,11 +68,11 @@ class UserTiming final : public GarbageCollected<UserTiming> {
   void Trace(blink::Visitor*);
 
  private:
-  explicit UserTiming(PerformanceBase&);
+  explicit UserTiming(Performance&);
 
   double FindExistingMarkStartTime(const String& mark_name, ExceptionState&);
 
-  Member<PerformanceBase> performance_;
+  Member<Performance> performance_;
   PerformanceEntryMap marks_map_;
   PerformanceEntryMap measures_map_;
 };

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

@@ -107,7 +107,7 @@ static TimeTicks ToTimeOrigin(LocalDOMWindow* window) {
 }
 
 WindowPerformance::WindowPerformance(LocalDOMWindow* window)
-    : PerformanceBase(
+    : Performance(
           ToTimeOrigin(window),
           window->document()->GetTaskRunner(TaskType::kPerformanceTimeline)),
       DOMWindowClient(window) {}
@@ -173,7 +173,7 @@ void WindowPerformance::UpdateLongTaskInstrumentation() {
 }
 
 void WindowPerformance::BuildJSONValue(V8ObjectBuilder& builder) const {
-  PerformanceBase::BuildJSONValue(builder);
+  Performance::BuildJSONValue(builder);
   builder.Add("timing", timing()->toJSONForBinding(builder.GetScriptState()));
   builder.Add("navigation",
               navigation()->toJSONForBinding(builder.GetScriptState()));
@@ -182,7 +182,7 @@ void WindowPerformance::BuildJSONValue(V8ObjectBuilder& builder) const {
 void WindowPerformance::Trace(blink::Visitor* visitor) {
   visitor->Trace(navigation_);
   visitor->Trace(timing_);
-  PerformanceBase::Trace(visitor);
+  Performance::Trace(visitor);
   PerformanceMonitor::Client::Trace(visitor);
   DOMWindowClient::Trace(visitor);
 }

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

@@ -36,13 +36,13 @@
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/frame/PerformanceMonitor.h"
 #include "core/timing/MemoryInfo.h"
-#include "core/timing/PerformanceBase.h"
+#include "core/timing/Performance.h"
 #include "core/timing/PerformanceNavigation.h"
 #include "core/timing/PerformanceTiming.h"
 
 namespace blink {
 
-class CORE_EXPORT WindowPerformance final : public PerformanceBase,
+class CORE_EXPORT WindowPerformance final : public Performance,
                                             public PerformanceMonitor::Client,
                                             public DOMWindowClient {
   DEFINE_WRAPPERTYPEINFO();
@@ -64,7 +64,7 @@ class CORE_EXPORT WindowPerformance final : public PerformanceBase,
   void UpdateLongTaskInstrumentation() override;
 
   void Trace(blink::Visitor*) override;
-  using PerformanceBase::TraceWrappers;
+  using Performance::TraceWrappers;
 
  private:
   explicit WindowPerformance(LocalDOMWindow*);

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

@@ -237,30 +237,30 @@ TEST_F(WindowPerformanceTest, ParameterHistogramForMeasure) {
 
   histogram_tester.ExpectBucketCount(
       kStartMarkForMeasureHistogram,
-      static_cast<int>(PerformanceBase::kUnloadEventStart), 1);
+      static_cast<int>(Performance::kUnloadEventStart), 1);
   histogram_tester.ExpectBucketCount(
       kEndMarkForMeasureHistogram,
-      static_cast<int>(PerformanceBase::kUnloadEventEnd), 1);
+      static_cast<int>(Performance::kUnloadEventEnd), 1);
 
   performance_->measure("testMark", "domInteractive", "[object Object]",
                         exception_state);
 
   histogram_tester.ExpectBucketCount(
       kStartMarkForMeasureHistogram,
-      static_cast<int>(PerformanceBase::kDomInteractive), 1);
+      static_cast<int>(Performance::kDomInteractive), 1);
   histogram_tester.ExpectBucketCount(
-      kEndMarkForMeasureHistogram,
-      static_cast<int>(PerformanceBase::kObjectObject), 1);
+      kEndMarkForMeasureHistogram, static_cast<int>(Performance::kObjectObject),
+      1);
 
   performance_->measure("testMark", "[object Object]", "[object Object]",
                         exception_state);
 
   histogram_tester.ExpectBucketCount(
       kStartMarkForMeasureHistogram,
-      static_cast<int>(PerformanceBase::kObjectObject), 1);
+      static_cast<int>(Performance::kObjectObject), 1);
   histogram_tester.ExpectBucketCount(
-      kEndMarkForMeasureHistogram,
-      static_cast<int>(PerformanceBase::kObjectObject), 2);
+      kEndMarkForMeasureHistogram, static_cast<int>(Performance::kObjectObject),
+      2);
 }
 
 }  // namespace blink

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

@@ -41,13 +41,13 @@
 namespace blink {
 
 WorkerPerformance::WorkerPerformance(WorkerGlobalScope* context)
-    : PerformanceBase(TimeTicksFromSeconds(context->TimeOrigin()),
-                      context->GetTaskRunner(TaskType::kPerformanceTimeline)),
+    : Performance(TimeTicksFromSeconds(context->TimeOrigin()),
+                  context->GetTaskRunner(TaskType::kPerformanceTimeline)),
       execution_context_(context) {}
 
 void WorkerPerformance::Trace(blink::Visitor* visitor) {
   visitor->Trace(execution_context_);
-  PerformanceBase::Trace(visitor);
+  Performance::Trace(visitor);
 }
 
 }  // namespace blink

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

@@ -31,7 +31,7 @@
 #ifndef WorkerPerformance_h
 #define WorkerPerformance_h
 
-#include "core/timing/PerformanceBase.h"
+#include "core/timing/Performance.h"
 #include "platform/bindings/ScriptWrappable.h"
 #include "platform/heap/Handle.h"
 #include "platform/wtf/Forward.h"
@@ -41,7 +41,7 @@ namespace blink {
 class ExecutionContext;
 class WorkerGlobalScope;
 
-class WorkerPerformance final : public PerformanceBase {
+class WorkerPerformance final : public Performance {
   DEFINE_WRAPPERTYPEINFO();
 
  public:

third_party/WebKit/Source/modules/webmidi/MIDIOutput.cpp

@@ -68,7 +68,7 @@ DOMUint8Array* ConvertUnsignedDataToUint8Array(
 
 base::TimeTicks GetTimeOrigin(ExecutionContext* context) {
   DCHECK(context);
-  PerformanceBase* performance = nullptr;
+  Performance* performance = nullptr;
   if (LocalDOMWindow* window = context->ExecutingWindow()) {
     performance = DOMWindowPerformance::performance(*window);
   } else {