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

Side by Side Diff: content/browser/media/webrtc_getusermedia_browsertest.cc

Issue 1057033002: Rename the trace filter name to be aligned with the class/method name. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename the TRACE filter name Created 5 years, 8 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 | « no previous file | content/browser/renderer_host/media/video_capture_device_client.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/json/json_reader.h" 6 #include "base/json/json_reader.h"
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/test/trace_event_analyzer.h" 8 #include "base/test/trace_event_analyzer.h"
9 #include "base/trace_event/trace_event_impl.h" 9 #include "base/trace_event/trace_event_impl.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 588
589 // This test will make a simple getUserMedia page, verify that video is playing 589 // This test will make a simple getUserMedia page, verify that video is playing
590 // in a simple local <video>, and for a couple of seconds, collect some 590 // in a simple local <video>, and for a couple of seconds, collect some
591 // performance traces from VideoCaptureController colorspace conversion and 591 // performance traces from VideoCaptureController colorspace conversion and
592 // potential resizing. 592 // potential resizing.
593 IN_PROC_BROWSER_TEST_F( 593 IN_PROC_BROWSER_TEST_F(
594 WebRtcGetUserMediaBrowserTest, 594 WebRtcGetUserMediaBrowserTest,
595 TraceVideoCaptureControllerPerformanceDuringGetUserMedia) { 595 TraceVideoCaptureControllerPerformanceDuringGetUserMedia) {
596 RunGetUserMediaAndCollectMeasures( 596 RunGetUserMediaAndCollectMeasures(
597 10, 597 10,
598 "VideoCaptureController::OnIncomingCapturedData", 598 "VideoCaptureDeviceClient::OnIncomingCapturedData",
599 "VideoCaptureController"); 599 "VideoCaptureDeviceClient");
600 } 600 }
601 601
602 // Test fails under MSan, http://crbug.com/445745 602 // Test fails under MSan, http://crbug.com/445745
603 #if defined(MEMORY_SANITIZER) 603 #if defined(MEMORY_SANITIZER)
604 #define MAYBE_TestGetUserMediaAspectRatio4To3 \ 604 #define MAYBE_TestGetUserMediaAspectRatio4To3 \
605 DISABLED_TestGetUserMediaAspectRatio4To3 605 DISABLED_TestGetUserMediaAspectRatio4To3
606 #else 606 #else
607 #define MAYBE_TestGetUserMediaAspectRatio4To3 TestGetUserMediaAspectRatio4To3 607 #define MAYBE_TestGetUserMediaAspectRatio4To3 TestGetUserMediaAspectRatio4To3
608 #endif 608 #endif
609 // This test calls getUserMedia and checks for aspect ratio behavior. 609 // This test calls getUserMedia and checks for aspect ratio behavior.
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 {640, 640, 360, 360, 10, 30}, 720 {640, 640, 360, 360, 10, 30},
721 {640, 640, 480, 480, 10, 30}, 721 {640, 640, 480, 480, 10, 30},
722 {960, 960, 720, 720, 10, 30}, 722 {960, 960, 720, 720, 10, 30},
723 {1280, 1280, 720, 720, 10, 30}}; 723 {1280, 1280, 720, 720, 10, 30}};
724 724
725 INSTANTIATE_TEST_CASE_P(UserMedia, 725 INSTANTIATE_TEST_CASE_P(UserMedia,
726 WebRtcConstraintsBrowserTest, 726 WebRtcConstraintsBrowserTest,
727 testing::ValuesIn(kAllUserMediaSizes)); 727 testing::ValuesIn(kAllUserMediaSizes));
728 728
729 } // namespace content 729 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/media/video_capture_device_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698