[PM] Rename V8PerFrameMemory classes to V8DetailedMemory

These classes will soon return memory usage of workers as well as
frames. This matches the name of the mojo interface in
third_party/blink/public/mojom/performance_manager/v8_detailed_memory_reporter.mojom.

Also renames v8_per_frame_memory_decorator* to v8_detailed_memory*.

A followup will split these classes into separate header files since
v8_detailed_memory.h is large enough to be unwieldy, and move
V8DetailedMemoryDecorator into a private file since it doesn't need to
be part of the public interface.

Bug: 1080672
Change-Id: I1c17e8bb1d6ee7d77638116495ba6ed8b5e4a4bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2453894
Commit-Queue: Joe Mason <joenotcharles@chromium.org>
Reviewed-by: François Doray <fdoray@chromium.org>
Reviewed-by: John Delaney <johnidel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815201}

chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer.cc

@@ -448,7 +448,7 @@ void AdsPageLoadMetricsObserver::UpdateAdFrameData(
       // would be no reason to monitor ad-frame memory usage and
       // |memory_request_| wouldn't be needed.
       memory_request_ = std::make_unique<
-          performance_manager::v8_memory::V8PerFrameMemoryRequestAnySeq>(
+          performance_manager::v8_memory::V8DetailedMemoryRequestAnySeq>(
           base::TimeDelta::FromSeconds(features::kMemoryPollInterval.Get()),
           features::kMemoryPollMode.Get());
       memory_request_->AddObserver(this);
@@ -707,9 +707,9 @@ void AdsPageLoadMetricsObserver::OnFrameDeleted(
 
 void AdsPageLoadMetricsObserver::OnV8MemoryMeasurementAvailable(
     performance_manager::RenderProcessHostId render_process_host_id,
-    const performance_manager::v8_memory::V8PerFrameMemoryProcessData&
+    const performance_manager::v8_memory::V8DetailedMemoryProcessData&
         process_data,
-    const V8PerFrameMemoryObserverAnySeq::FrameDataMap& frame_data) {
+    const V8DetailedMemoryObserverAnySeq::FrameDataMap& frame_data) {
   num_memory_updates_++;
 
   // Iterate through frames with available measurements.

chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer.h

@@ -19,7 +19,7 @@
 #include "chrome/browser/page_load_metrics/observers/ad_metrics/page_ad_density_tracker.h"
 #include "components/page_load_metrics/browser/page_load_metrics_observer.h"
 #include "components/page_load_metrics/common/page_load_metrics.mojom-forward.h"
-#include "components/performance_manager/public/v8_memory/v8_per_frame_memory_decorator.h"
+#include "components/performance_manager/public/v8_memory/v8_detailed_memory.h"
 #include "components/subresource_filter/content/browser/subresource_filter_observer.h"
 #include "components/subresource_filter/content/browser/subresource_filter_observer_manager.h"
 #include "components/subresource_filter/core/common/load_policy.h"
@@ -27,7 +27,7 @@
 #include "services/metrics/public/cpp/ukm_source.h"
 
 using MeasurementMode =
-    performance_manager::v8_memory::V8PerFrameMemoryRequest::MeasurementMode;
+    performance_manager::v8_memory::V8DetailedMemoryRequest::MeasurementMode;
 
 namespace features {
 extern const base::Feature kRestrictedNavigationAdTagging;
@@ -43,7 +43,7 @@ class HeavyAdBlocklist;
 // relevant per-frame and whole-page byte statistics.
 class AdsPageLoadMetricsObserver
     : public page_load_metrics::PageLoadMetricsObserver,
-      public performance_manager::v8_memory::V8PerFrameMemoryObserverAnySeq,
+      public performance_manager::v8_memory::V8DetailedMemoryObserverAnySeq,
       public subresource_filter::SubresourceFilterObserver {
  public:
   // Returns a new AdsPageLoadMetricsObserver. If the feature is disabled it
@@ -145,12 +145,12 @@ class AdsPageLoadMetricsObserver
     heavy_ad_threshold_noise_provider_ = std::move(noise_provider);
   }
 
-  // performance_manager::v8_memory::V8PerFrameMemoryObserverAnySeq
+  // performance_manager::v8_memory::V8DetailedMemoryObserverAnySeq
   void OnV8MemoryMeasurementAvailable(
       performance_manager::RenderProcessHostId render_process_host_id,
-      const performance_manager::v8_memory::V8PerFrameMemoryProcessData&
+      const performance_manager::v8_memory::V8DetailedMemoryProcessData&
           process_data,
-      const V8PerFrameMemoryObserverAnySeq::FrameDataMap& frame_data) override;
+      const V8DetailedMemoryObserverAnySeq::FrameDataMap& frame_data) override;
 
   void UpdateAggregateMemoryUsage(int64_t bytes,
                                   FrameData::FrameVisibility visibility);
@@ -342,7 +342,7 @@ class AdsPageLoadMetricsObserver
 
   // Tracks per ad-frame V8 memory measurements for the page during its
   // lifecycle. Lazily initialized when the first ad is detected.
-  std::unique_ptr<performance_manager::v8_memory::V8PerFrameMemoryRequestAnySeq>
+  std::unique_ptr<performance_manager::v8_memory::V8DetailedMemoryRequestAnySeq>
       memory_request_;
 
   // Tracks number of memory updates received.

chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer_browsertest.cc

@@ -129,16 +129,16 @@ void LoadLargeResource(net::test_server::ControllableHttpResponse* response,
 }  // namespace
 
 class MemoryMeasurementWaiter
-    : public performance_manager::v8_memory::V8PerFrameMemoryObserverAnySeq {
+    : public performance_manager::v8_memory::V8DetailedMemoryObserverAnySeq {
  public:
   MemoryMeasurementWaiter() = default;
   ~MemoryMeasurementWaiter() override = default;
 
   void OnV8MemoryMeasurementAvailable(
       performance_manager::RenderProcessHostId process_id,
-      const performance_manager::v8_memory::V8PerFrameMemoryProcessData&
+      const performance_manager::v8_memory::V8DetailedMemoryProcessData&
           process_data,
-      const performance_manager::v8_memory::V8PerFrameMemoryObserverAnySeq::
+      const performance_manager::v8_memory::V8DetailedMemoryObserverAnySeq::
           FrameDataMap& frame_data) override {
     // Iterate through frames with available measurements.
     for (const auto& map_pair : frame_data) {
@@ -2380,9 +2380,9 @@ IN_PROC_BROWSER_TEST_F(AdsMemoryMeasurementBrowserTest,
 
   // Instantiate a memory request and waiter to wait for a minimum
   // number of memory measurements to be received.
-  std::unique_ptr<performance_manager::v8_memory::V8PerFrameMemoryRequestAnySeq>
+  std::unique_ptr<performance_manager::v8_memory::V8DetailedMemoryRequestAnySeq>
       memory_request = std::make_unique<
-          performance_manager::v8_memory::V8PerFrameMemoryRequestAnySeq>(
+          performance_manager::v8_memory::V8DetailedMemoryRequestAnySeq>(
           base::TimeDelta::FromSeconds(1), MeasurementMode::kEagerForTesting);
   auto waiter = std::make_unique<MemoryMeasurementWaiter>();
   memory_request->AddObserver(waiter.get());

chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer_unittest.cc

@@ -71,7 +71,7 @@ using page_load_metrics::OptionalMin;
 namespace {
 
 using FrameDataMap =
-    AdsPageLoadMetricsObserver::V8PerFrameMemoryObserverAnySeq::FrameDataMap;
+    AdsPageLoadMetricsObserver::V8DetailedMemoryObserverAnySeq::FrameDataMap;
 using FrameTreeNodeId = int;
 
 struct MemoryFrameData {
@@ -142,7 +142,7 @@ FrameDataMap MakeFrameDataMap(int process_id,
 
   for (const auto& entry : data) {
     content::GlobalFrameRoutingId global_id(process_id, entry.frame_id);
-    performance_manager::v8_memory::V8PerFrameMemoryFrameData frame_data;
+    performance_manager::v8_memory::V8DetailedMemoryFrameData frame_data;
     frame_data.set_v8_bytes_used(entry.bytes_used);
     data_map[global_id] = frame_data;
   }
@@ -842,7 +842,7 @@ class AdsPageLoadMetricsObserverTest
         static_cast<performance_manager::RenderProcessHostId>(process_id);
 
     FrameDataMap frame_data = MakeFrameDataMap(process_id, memory_data);
-    performance_manager::v8_memory::V8PerFrameMemoryProcessData process_data;
+    performance_manager::v8_memory::V8DetailedMemoryProcessData process_data;
 
     if (ads_observer_) {
       ads_observer_->OnV8MemoryMeasurementAvailable(pm_process_id, process_data,

components/performance_manager/BUILD.gn

@@ -120,7 +120,7 @@ static_library("performance_manager") {
     "public/render_frame_host_proxy.h",
     "public/render_process_host_id.h",
     "public/render_process_host_proxy.h",
-    "public/v8_memory/v8_per_frame_memory_decorator.h",
+    "public/v8_memory/v8_detailed_memory.h",
     "public/web_contents_proxy.h",
     "registered_objects.h",
     "render_frame_host_proxy.cc",
@@ -141,7 +141,7 @@ static_library("performance_manager") {
     "v8_memory/v8_context_tracker_internal.h",
     "v8_memory/v8_context_tracker_types.cc",
     "v8_memory/v8_context_tracker_types.h",
-    "v8_memory/v8_per_frame_memory_decorator.cc",
+    "v8_memory/v8_detailed_memory.cc",
     "web_contents_proxy.cc",
     "web_contents_proxy_impl.cc",
     "web_contents_proxy_impl.h",
@@ -233,7 +233,7 @@ source_set("unit_tests") {
     "registered_objects_unittest.cc",
     "v8_memory/v8_context_tracker_helpers_unittest.cc",
     "v8_memory/v8_context_tracker_internal_unittest.cc",
-    "v8_memory/v8_per_frame_memory_decorator_unittest.cc",
+    "v8_memory/v8_detailed_memory_unittest.cc",
     "web_contents_proxy_unittest.cc",
     "worker_watcher_unittest.cc",
   ]