Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(621)

Unified Diff: content/browser/media/session/mock_media_session_player_observer.cc

Issue 2416853005: Fixing naming issues in MediaSession (Closed)
Patch Set: addressed nits Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/media/session/mock_media_session_player_observer.cc
diff --git a/content/browser/media/session/mock_media_session_observer.cc b/content/browser/media/session/mock_media_session_player_observer.cc
similarity index 56%
rename from content/browser/media/session/mock_media_session_observer.cc
rename to content/browser/media/session/mock_media_session_player_observer.cc
index edc213a1090c8f07bf849d16d60999180dabe64b..b26bc40010d48a18a281ef4e23c91c889ee5f617 100644
--- a/content/browser/media/session/mock_media_session_observer.cc
+++ b/content/browser/media/session/mock_media_session_player_observer.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/browser/media/session/mock_media_session_observer.h"
+#include "content/browser/media/session/mock_media_session_player_observer.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace content {
-MockMediaSessionObserver::MockMediaSessionObserver() = default;
+MockMediaSessionPlayerObserver::MockMediaSessionPlayerObserver() = default;
-MockMediaSessionObserver::~MockMediaSessionObserver() = default;
+MockMediaSessionPlayerObserver::~MockMediaSessionPlayerObserver() = default;
-void MockMediaSessionObserver::OnSuspend(int player_id) {
+void MockMediaSessionPlayerObserver::OnSuspend(int player_id) {
EXPECT_GE(player_id, 0);
EXPECT_GT(players_.size(), static_cast<size_t>(player_id));
@@ -20,7 +20,7 @@ void MockMediaSessionObserver::OnSuspend(int player_id) {
players_[player_id].is_playing_ = false;
}
-void MockMediaSessionObserver::OnResume(int player_id) {
+void MockMediaSessionPlayerObserver::OnResume(int player_id) {
EXPECT_GE(player_id, 0);
EXPECT_GT(players_.size(), static_cast<size_t>(player_id));
@@ -28,8 +28,9 @@ void MockMediaSessionObserver::OnResume(int player_id) {
players_[player_id].is_playing_ = true;
}
-void MockMediaSessionObserver::OnSetVolumeMultiplier(
- int player_id, double volume_multiplier) {
+void MockMediaSessionPlayerObserver::OnSetVolumeMultiplier(
+ int player_id,
+ double volume_multiplier) {
EXPECT_GE(player_id, 0);
EXPECT_GT(players_.size(), static_cast<size_t>(player_id));
@@ -39,31 +40,32 @@ void MockMediaSessionObserver::OnSetVolumeMultiplier(
players_[player_id].volume_multiplier_ = volume_multiplier;
}
-int MockMediaSessionObserver::StartNewPlayer() {
+int MockMediaSessionPlayerObserver::StartNewPlayer() {
players_.push_back(MockPlayer(true, 1.0f));
return players_.size() - 1;
}
-bool MockMediaSessionObserver::IsPlaying(size_t player_id) {
+bool MockMediaSessionPlayerObserver::IsPlaying(size_t player_id) {
EXPECT_GT(players_.size(), player_id);
return players_[player_id].is_playing_;
}
-double MockMediaSessionObserver::GetVolumeMultiplier(size_t player_id) {
+double MockMediaSessionPlayerObserver::GetVolumeMultiplier(size_t player_id) {
EXPECT_GT(players_.size(), player_id);
return players_[player_id].volume_multiplier_;
}
-void MockMediaSessionObserver::SetPlaying(size_t player_id, bool playing) {
+void MockMediaSessionPlayerObserver::SetPlaying(size_t player_id,
+ bool playing) {
EXPECT_GT(players_.size(), player_id);
players_[player_id].is_playing_ = playing;
}
-int MockMediaSessionObserver::received_suspend_calls() const {
+int MockMediaSessionPlayerObserver::received_suspend_calls() const {
return received_suspend_calls_;
}
-int MockMediaSessionObserver::received_resume_calls() const {
+int MockMediaSessionPlayerObserver::received_resume_calls() const {
return received_resume_calls_;
}

Powered by Google App Engine
This is Rietveld 408576698