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

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

Issue 2756883002: Use NiceMock for MediaSession/AudioFocus tests (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « content/browser/media/session/media_session_impl_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/session/media_session_impl_service_routing_unittest.cc
diff --git a/content/browser/media/session/media_session_impl_service_routing_unittest.cc b/content/browser/media/session/media_session_impl_service_routing_unittest.cc
index 2aa4d8443d86a13a37a4f4809726c97e147fc487..422897babf8715c9ecb0bb7a24e04bc5781ad793 100644
--- a/content/browser/media/session/media_session_impl_service_routing_unittest.cc
+++ b/content/browser/media/session/media_session_impl_service_routing_unittest.cc
@@ -22,6 +22,7 @@ using ::testing::_;
using ::testing::AnyNumber;
using ::testing::Eq;
using ::testing::InvokeWithoutArgs;
+using ::testing::NiceMock;
namespace content {
@@ -84,8 +85,8 @@ class MediaSessionImplServiceRoutingTest
RenderViewHostImplTestHarness::SetUp();
contents()->GetMainFrame()->InitializeRenderFrameIfNeeded();
- mock_media_session_observer_.reset(
- new MockMediaSessionObserver(MediaSessionImpl::Get(contents())));
+ mock_media_session_observer_.reset(new NiceMock<MockMediaSessionObserver>(
+ MediaSessionImpl::Get(contents())));
main_frame_ = contents()->GetMainFrame();
sub_frame_ = main_frame_->AppendChild("sub_frame");
@@ -108,8 +109,9 @@ class MediaSessionImplServiceRoutingTest
}
void CreateServiceForFrame(TestRenderFrameHost* frame) {
- services_[frame] = base::MakeUnique<MockMediaSessionServiceImpl>(frame);
- clients_[frame] = base::MakeUnique<MockMediaSessionClient>();
+ services_[frame] =
+ base::MakeUnique<NiceMock<MockMediaSessionServiceImpl>>(frame);
+ clients_[frame] = base::MakeUnique<NiceMock<MockMediaSessionClient>>();
services_[frame]->SetClient(clients_[frame]->CreateInterfacePtrAndBind());
}
@@ -124,7 +126,8 @@ class MediaSessionImplServiceRoutingTest
}
void StartPlayerForFrame(TestRenderFrameHost* frame) {
- players_[frame] = base::MakeUnique<MockMediaSessionPlayerObserver>(frame);
+ players_[frame] =
+ base::MakeUnique<NiceMock<MockMediaSessionPlayerObserver>>(frame);
MediaSessionImpl::Get(contents())
->AddPlayer(players_[frame].get(), kPlayerId,
media::MediaContentType::Persistent);
« no previous file with comments | « content/browser/media/session/media_session_impl_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698