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

Side by Side Diff: content/renderer/media/webmediaplayer_ms_unittest.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "content/public/renderer/media_stream_renderer_factory.h" 9 #include "content/public/renderer/media_stream_renderer_factory.h"
10 #include "content/renderer/media/webmediaplayer_ms.h" 10 #include "content/renderer/media/webmediaplayer_ms.h"
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 bool odd_size_frame, 204 bool odd_size_frame,
205 int double_size_index, 205 int double_size_index,
206 media::VideoRotation rotation) { 206 media::VideoRotation rotation) {
207 gfx::Size standard_size = gfx::Size(kStandardWidth, kStandardHeight); 207 gfx::Size standard_size = gfx::Size(kStandardWidth, kStandardHeight);
208 for (size_t i = 0; i < timestamp_or_frame_type.size(); i++) { 208 for (size_t i = 0; i < timestamp_or_frame_type.size(); i++) {
209 const int token = timestamp_or_frame_type[i]; 209 const int token = timestamp_or_frame_type[i];
210 if (static_cast<int>(i) == double_size_index) { 210 if (static_cast<int>(i) == double_size_index) {
211 standard_size = gfx::Size(kStandardWidth * 2, kStandardHeight * 2); 211 standard_size = gfx::Size(kStandardWidth * 2, kStandardHeight * 2);
212 } 212 }
213 if (token < static_cast<int>(FrameType::MIN_TYPE)) { 213 if (token < static_cast<int>(FrameType::MIN_TYPE)) {
214 CHECK(false) << "Unrecognized frame type: " << token; 214 // Unrecognized frame type.
215 CHECK(false);
215 return; 216 return;
216 } 217 }
217 218
218 if (token < 0) { 219 if (token < 0) {
219 AddFrame(static_cast<FrameType>(token), nullptr); 220 AddFrame(static_cast<FrameType>(token), nullptr);
220 continue; 221 continue;
221 } 222 }
222 223
223 if (token >= 0) { 224 if (token >= 0) {
224 gfx::Size frame_size; 225 gfx::Size frame_size;
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
935 // OnShown() should restart after a forced suspension. 936 // OnShown() should restart after a forced suspension.
936 player_->OnShown(); 937 player_->OnShown();
937 EXPECT_FALSE(player_->paused()); 938 EXPECT_FALSE(player_->paused());
938 EXPECT_CALL(*this, DoSetWebLayer(false)); 939 EXPECT_CALL(*this, DoSetWebLayer(false));
939 940
940 base::RunLoop().RunUntilIdle(); 941 base::RunLoop().RunUntilIdle();
941 } 942 }
942 #endif 943 #endif
943 944
944 } // namespace content 945 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698