Commit 326ffba0 authored by Gyuyoung Kim's avatar Gyuyoung Kim Committed by Commit Bot

Clean up all old uses of IdleManager interface

This CL converts all uses of IdleManager interface
as below,

  - Convert BindingSet to ReceiverSet
  - Convert IdleManagerRequest to
    PendingReceiver<IdleManager>

Bug: 955171
Change-Id: I89f1a325b0e3290c1fdb36d5bc92389c8716e546
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1932139Reviewed-by: default avatarAyu Ishii <ayui@chromium.org>
Reviewed-by: default avatarDave Tapuska <dtapuska@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719360}
parent 8efba051
...@@ -74,10 +74,11 @@ IdleManager::~IdleManager() { ...@@ -74,10 +74,11 @@ IdleManager::~IdleManager() {
} }
} }
void IdleManager::CreateService(blink::mojom::IdleManagerRequest request) { void IdleManager::CreateService(
mojo::PendingReceiver<blink::mojom::IdleManager> receiver) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
bindings_.AddBinding(this, std::move(request)); receivers_.Add(this, std::move(receiver));
} }
void IdleManager::AddMonitor( void IdleManager::AddMonitor(
...@@ -86,7 +87,7 @@ void IdleManager::AddMonitor( ...@@ -86,7 +87,7 @@ void IdleManager::AddMonitor(
AddMonitorCallback callback) { AddMonitorCallback callback) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
if (threshold < kMinimumThreshold) { if (threshold < kMinimumThreshold) {
bindings_.ReportBadMessage("Minimum threshold is 60 seconds."); receivers_.ReportBadMessage("Minimum threshold is 60 seconds.");
return; return;
} }
......
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
#include "base/time/time.h" #include "base/time/time.h"
#include "base/timer/timer.h" #include "base/timer/timer.h"
#include "content/browser/idle/idle_monitor.h" #include "content/browser/idle/idle_monitor.h"
#include "mojo/public/cpp/bindings/binding_set.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/receiver_set.h"
#include "third_party/blink/public/mojom/idle/idle_manager.mojom.h" #include "third_party/blink/public/mojom/idle/idle_manager.mojom.h"
#include "ui/base/idle/idle.h" #include "ui/base/idle/idle.h"
#include "url/origin.h" #include "url/origin.h"
...@@ -51,7 +52,7 @@ class CONTENT_EXPORT IdleManager : public blink::mojom::IdleManager { ...@@ -51,7 +52,7 @@ class CONTENT_EXPORT IdleManager : public blink::mojom::IdleManager {
IdleManager(); IdleManager();
~IdleManager() override; ~IdleManager() override;
void CreateService(blink::mojom::IdleManagerRequest request); void CreateService(mojo::PendingReceiver<blink::mojom::IdleManager> receiver);
// blink.mojom.IdleManager: // blink.mojom.IdleManager:
void AddMonitor(base::TimeDelta threshold, void AddMonitor(base::TimeDelta threshold,
...@@ -91,7 +92,7 @@ class CONTENT_EXPORT IdleManager : public blink::mojom::IdleManager { ...@@ -91,7 +92,7 @@ class CONTENT_EXPORT IdleManager : public blink::mojom::IdleManager {
std::unique_ptr<IdleTimeProvider> idle_time_provider_; std::unique_ptr<IdleTimeProvider> idle_time_provider_;
// Registered clients. // Registered clients.
mojo::BindingSet<blink::mojom::IdleManager> bindings_; mojo::ReceiverSet<blink::mojom::IdleManager> receivers_;
// Owns Monitor instances, added when clients call AddMonitor(). // Owns Monitor instances, added when clients call AddMonitor().
base::LinkedList<IdleMonitor> monitors_; base::LinkedList<IdleMonitor> monitors_;
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/mojom/idle/idle_manager.mojom.h" #include "third_party/blink/public/mojom/idle/idle_manager.mojom.h"
using blink::mojom::IdleManagerPtr;
using blink::mojom::IdleMonitorPtr; using blink::mojom::IdleMonitorPtr;
using ::testing::_; using ::testing::_;
using ::testing::InSequence; using ::testing::InSequence;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment