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

Side by Side Diff: media/base/android/media_source_player_unittest.cc

Issue 1396113004: Don't use base::MessageLoop::{Quit,QuitClosure} in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « media/audio/win/audio_low_latency_output_win_unittest.cc ('k') | media/cast/test/sender.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <string> 5 #include <string>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 void OnMediaMetadataChanged(int player_id, 61 void OnMediaMetadataChanged(int player_id,
62 base::TimeDelta duration, 62 base::TimeDelta duration,
63 int width, 63 int width,
64 int height, 64 int height,
65 bool success) override { 65 bool success) override {
66 num_metadata_changes_++; 66 num_metadata_changes_++;
67 } 67 }
68 void OnPlaybackComplete(int player_id) override { 68 void OnPlaybackComplete(int player_id) override {
69 playback_completed_ = true; 69 playback_completed_ = true;
70 if (message_loop_->is_running()) 70 if (message_loop_->is_running())
71 message_loop_->Quit(); 71 message_loop_->QuitWhenIdle();
72 } 72 }
73 void OnMediaInterrupted(int player_id) override {} 73 void OnMediaInterrupted(int player_id) override {}
74 void OnBufferingUpdate(int player_id, int percentage) override {} 74 void OnBufferingUpdate(int player_id, int percentage) override {}
75 void OnSeekComplete(int player_id, 75 void OnSeekComplete(int player_id,
76 const base::TimeDelta& current_time) override {} 76 const base::TimeDelta& current_time) override {}
77 void OnError(int player_id, int error) override {} 77 void OnError(int player_id, int error) override {}
78 void OnVideoSizeChanged(int player_id, int width, int height) override {} 78 void OnVideoSizeChanged(int player_id, int width, int height) override {}
79 void OnWaitingForDecryptionKey(int player_id) override {} 79 void OnWaitingForDecryptionKey(int player_id) override {}
80 MediaPlayerAndroid* GetFullscreenPlayer() override { return NULL; } 80 MediaPlayerAndroid* GetFullscreenPlayer() override { return NULL; }
81 MediaPlayerAndroid* GetPlayer(int player_id) override { return NULL; } 81 MediaPlayerAndroid* GetPlayer(int player_id) override { return NULL; }
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 : message_loop_(message_loop), 124 : message_loop_(message_loop),
125 num_data_requests_(0), 125 num_data_requests_(0),
126 num_seek_requests_(0), 126 num_seek_requests_(0),
127 num_browser_seek_requests_(0) {} 127 num_browser_seek_requests_(0) {}
128 ~MockDemuxerAndroid() override {} 128 ~MockDemuxerAndroid() override {}
129 129
130 void Initialize(DemuxerAndroidClient* client) override {} 130 void Initialize(DemuxerAndroidClient* client) override {}
131 void RequestDemuxerData(DemuxerStream::Type type) override { 131 void RequestDemuxerData(DemuxerStream::Type type) override {
132 num_data_requests_++; 132 num_data_requests_++;
133 if (message_loop_->is_running()) 133 if (message_loop_->is_running())
134 message_loop_->Quit(); 134 message_loop_->QuitWhenIdle();
135 } 135 }
136 void RequestDemuxerSeek(const base::TimeDelta& time_to_seek, 136 void RequestDemuxerSeek(const base::TimeDelta& time_to_seek,
137 bool is_browser_seek) override { 137 bool is_browser_seek) override {
138 num_seek_requests_++; 138 num_seek_requests_++;
139 if (is_browser_seek) 139 if (is_browser_seek)
140 num_browser_seek_requests_++; 140 num_browser_seek_requests_++;
141 } 141 }
142 142
143 int num_data_requests() const { return num_data_requests_; } 143 int num_data_requests() const { return num_data_requests_; }
144 int num_seek_requests() const { return num_seek_requests_; } 144 int num_seek_requests() const { return num_seek_requests_; }
(...skipping 2241 matching lines...) Expand 10 before | Expand all | Expand 10 after
2386 2386
2387 EXPECT_EQ(demuxer_->num_data_requests(), 0); 2387 EXPECT_EQ(demuxer_->num_data_requests(), 0);
2388 player_.OnDemuxerConfigsAvailable(CreateDemuxerConfigs(true, true)); 2388 player_.OnDemuxerConfigsAvailable(CreateDemuxerConfigs(true, true));
2389 2389
2390 manager_.set_allow_play(true); 2390 manager_.set_allow_play(true);
2391 player_.Start(); 2391 player_.Start();
2392 EXPECT_TRUE(player_.IsPlaying()); 2392 EXPECT_TRUE(player_.IsPlaying());
2393 } 2393 }
2394 2394
2395 } // namespace media 2395 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/win/audio_low_latency_output_win_unittest.cc ('k') | media/cast/test/sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698