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

Side by Side Diff: content/browser/media/session/media_session_impl_browsertest.cc

Issue 2585243002: [MediaSession] A fix for MediaSessionService routing (Closed)
Patch Set: fixed compile warning Created 4 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/media/session/media_session_impl.h" 5 #include "content/browser/media/session/media_session_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <list> 9 #include <list>
10 #include <vector> 10 #include <vector>
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 : MediaSessionImpl::State::INACTIVE); 150 : MediaSessionImpl::State::INACTIVE);
151 } 151 }
152 152
153 void SystemStartDucking() { media_session_->StartDucking(); } 153 void SystemStartDucking() { media_session_->StartDucking(); }
154 154
155 void SystemStopDucking() { media_session_->StopDucking(); } 155 void SystemStopDucking() { media_session_->StopDucking(); }
156 156
157 void EnsureMediaSessionService() { 157 void EnsureMediaSessionService() {
158 mock_media_session_service_.reset(new MockMediaSessionServiceImpl( 158 mock_media_session_service_.reset(new MockMediaSessionServiceImpl(
159 shell()->web_contents()->GetMainFrame())); 159 shell()->web_contents()->GetMainFrame()));
160 mock_media_session_service_->SetMetadata(content::MediaMetadata());
161 } 160 }
162 161
163 void SetPlaybackState(blink::mojom::MediaSessionPlaybackState state) { 162 void SetPlaybackState(blink::mojom::MediaSessionPlaybackState state) {
164 mock_media_session_service_->SetPlaybackState(state); 163 mock_media_session_service_->SetPlaybackState(state);
165 } 164 }
166 165
167 MockMediaSessionObserver* mock_media_session_observer() { 166 MockMediaSessionObserver* mock_media_session_observer() {
168 return mock_media_session_observer_.get(); 167 return mock_media_session_observer_.get();
169 } 168 }
170 169
(...skipping 1245 matching lines...) Expand 10 before | Expand all | Expand 10 after
1416 StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent); 1415 StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
1417 clock->Advance(base::TimeDelta::FromMilliseconds(1000)); 1416 clock->Advance(base::TimeDelta::FromMilliseconds(1000));
1418 media_session_->Stop(MediaSession::SuspendType::UI); 1417 media_session_->Stop(MediaSession::SuspendType::UI);
1419 1418
1420 std::unique_ptr<base::HistogramSamples> samples( 1419 std::unique_ptr<base::HistogramSamples> samples(
1421 tester.GetHistogramSamplesSinceCreation("Media.Session.ActiveTime")); 1420 tester.GetHistogramSamplesSinceCreation("Media.Session.ActiveTime"));
1422 EXPECT_EQ(2, samples->TotalCount()); 1421 EXPECT_EQ(2, samples->TotalCount());
1423 EXPECT_EQ(1, samples->GetCount(1000)); 1422 EXPECT_EQ(1, samples->GetCount(1000));
1424 EXPECT_EQ(1, samples->GetCount(10000)); 1423 EXPECT_EQ(1, samples->GetCount(10000));
1425 } 1424 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698