Make it explicit that CU IDs passed in PageSignalReceiver are page CU IDs.

Follow up on this comment: https://chromium-review.googlesource.com/c/chromium/src/+/1068665/13/services/resource_coordinator/public/mojom/page_signal.mojom#18

Change-Id: Ib930db9c0326c9fae8cd7c2bf8b771d5a196c164
Reviewed-on: https://chromium-review.googlesource.com/1076897Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Chris Hamilton <chrisha@chromium.org>
Commit-Queue: Sébastien Marchand <sebmarchand@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562576}

chrome/browser/resource_coordinator/page_signal_receiver.cc

@@ -36,9 +36,10 @@ PageSignalReceiver::PageSignalReceiver() : binding_(this) {}
 
 PageSignalReceiver::~PageSignalReceiver() = default;
 
-void PageSignalReceiver::NotifyPageAlmostIdle(const CoordinationUnitID& cu_id) {
+void PageSignalReceiver::NotifyPageAlmostIdle(
+    const CoordinationUnitID& page_cu_id) {
   DCHECK(IsPageAlmostIdleSignalEnabled());
-  auto web_contents_iter = cu_id_web_contents_map_.find(cu_id);
+  auto web_contents_iter = cu_id_web_contents_map_.find(page_cu_id);
   if (web_contents_iter == cu_id_web_contents_map_.end())
     return;
   for (auto& observer : observers_)
@@ -46,9 +47,9 @@ void PageSignalReceiver::NotifyPageAlmostIdle(const CoordinationUnitID& cu_id) {
 }
 
 void PageSignalReceiver::SetExpectedTaskQueueingDuration(
-    const CoordinationUnitID& cu_id,
+    const CoordinationUnitID& page_cu_id,
     base::TimeDelta duration) {
-  auto web_contents_iter = cu_id_web_contents_map_.find(cu_id);
+  auto web_contents_iter = cu_id_web_contents_map_.find(page_cu_id);
   if (web_contents_iter == cu_id_web_contents_map_.end())
     return;
   for (auto& observer : observers_)
@@ -56,9 +57,9 @@ void PageSignalReceiver::SetExpectedTaskQueueingDuration(
                                                duration);
 }
 
-void PageSignalReceiver::SetLifecycleState(const CoordinationUnitID& cu_id,
+void PageSignalReceiver::SetLifecycleState(const CoordinationUnitID& page_cu_id,
                                            mojom::LifecycleState state) {
-  auto web_contents_iter = cu_id_web_contents_map_.find(cu_id);
+  auto web_contents_iter = cu_id_web_contents_map_.find(page_cu_id);
   if (web_contents_iter == cu_id_web_contents_map_.end())
     return;
   for (auto& observer : observers_)
@@ -66,8 +67,8 @@ void PageSignalReceiver::SetLifecycleState(const CoordinationUnitID& cu_id,
 }
 
 void PageSignalReceiver::NotifyNonPersistentNotificationCreated(
-    const CoordinationUnitID& cu_id) {
-  auto web_contents_iter = cu_id_web_contents_map_.find(cu_id);
+    const CoordinationUnitID& page_cu_id) {
+  auto web_contents_iter = cu_id_web_contents_map_.find(page_cu_id);
   if (web_contents_iter == cu_id_web_contents_map_.end())
     return;
   for (auto& observer : observers_)

chrome/browser/resource_coordinator/page_signal_receiver.h

@@ -51,13 +51,13 @@ class PageSignalReceiver : public mojom::PageSignalReceiver {
   static PageSignalReceiver* GetInstance();
 
   // mojom::PageSignalReceiver implementation.
-  void NotifyPageAlmostIdle(const CoordinationUnitID& cu_id) override;
-  void SetExpectedTaskQueueingDuration(const CoordinationUnitID& cu_id,
+  void NotifyPageAlmostIdle(const CoordinationUnitID& page_cu_id) override;
+  void SetExpectedTaskQueueingDuration(const CoordinationUnitID& page_cu_id,
                                        base::TimeDelta duration) override;
-  void SetLifecycleState(const CoordinationUnitID& cu_id,
+  void SetLifecycleState(const CoordinationUnitID& page_cu_id,
                          mojom::LifecycleState) override;
   void NotifyNonPersistentNotificationCreated(
-      const CoordinationUnitID& cu_id) override;
+      const CoordinationUnitID& page_cu_id) override;
 
   void AddObserver(PageSignalObserver* observer);
   void RemoveObserver(PageSignalObserver* observer);

services/resource_coordinator/observers/page_signal_generator_impl_unittest.cc

@@ -43,13 +43,13 @@ class MockPageSignalReceiver : public mojom::PageSignalReceiver {
   ~MockPageSignalReceiver() override = default;
 
   // mojom::PageSignalReceiver implementation.
-  void NotifyPageAlmostIdle(const CoordinationUnitID& cu_id) override {}
-  void SetExpectedTaskQueueingDuration(const CoordinationUnitID& cu_id,
+  void NotifyPageAlmostIdle(const CoordinationUnitID& page_cu_id) override {}
+  void SetExpectedTaskQueueingDuration(const CoordinationUnitID& page_cu_id,
                                        base::TimeDelta duration) override {}
-  void SetLifecycleState(const CoordinationUnitID& cu_id,
+  void SetLifecycleState(const CoordinationUnitID& page_cu_id,
                          mojom::LifecycleState) override {}
   MOCK_METHOD1(NotifyNonPersistentNotificationCreated,
-               void(const CoordinationUnitID& cu_id));
+               void(const CoordinationUnitID& page_cu_id));
 
  private:
   mojo::Binding<mojom::PageSignalReceiver> binding_;

services/resource_coordinator/public/mojom/page_signal.mojom

@@ -15,17 +15,19 @@ import "mojo/public/mojom/base/time.mojom";
 // pass the interface pointer of mojo channel to PageSignalGenerator through
 // PageSignalGenerator::AddReceiver.
 interface PageSignalReceiver {
-  NotifyPageAlmostIdle(CoordinationUnitID cu_id);
-  SetExpectedTaskQueueingDuration(CoordinationUnitID cu_id,
+  NotifyPageAlmostIdle(CoordinationUnitID page_cu_id);
+  SetExpectedTaskQueueingDuration(CoordinationUnitID page_cu_id,
                                   mojo_base.mojom.TimeDelta duration);
-  SetLifecycleState(CoordinationUnitID cu_id,
+  SetLifecycleState(CoordinationUnitID page_cu_id,
                     LifecycleState state);
+
   // Indicates that the page has created a non-persistent web notification, i.e.
   // a notification created by a particular page (in opposition to persistent
   // web notifications, who require a service worker).
   //
-  // |cu_id| is the coordination ID of the page that created this notification.
-  NotifyNonPersistentNotificationCreated(CoordinationUnitID cu_id);
+  // |page_cu_id| is the coordination ID of the page that created this
+  // notification.
+  NotifyNonPersistentNotificationCreated(CoordinationUnitID page_cu_id);
 };
 
 // A PageSignalGenerator implementation will be implemented inside GRC to receive