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

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

Issue 425593002: Refactor trace_event_impl's SetEnabled to use TraceOptions. Propagate this through the whole stack. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address joechan's comments Created 6 years, 4 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
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/debug/trace_event_impl.h" 6 #include "base/debug/trace_event_impl.h"
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/test/trace_event_analyzer.h" 9 #include "base/test/trace_event_analyzer.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 namespace content { 76 namespace content {
77 77
78 class WebRtcGetUserMediaBrowserTest: public WebRtcContentBrowserTest { 78 class WebRtcGetUserMediaBrowserTest: public WebRtcContentBrowserTest {
79 public: 79 public:
80 WebRtcGetUserMediaBrowserTest() : trace_log_(NULL) {} 80 WebRtcGetUserMediaBrowserTest() : trace_log_(NULL) {}
81 virtual ~WebRtcGetUserMediaBrowserTest() {} 81 virtual ~WebRtcGetUserMediaBrowserTest() {}
82 82
83 void StartTracing() { 83 void StartTracing() {
84 CHECK(trace_log_ == NULL) << "Can only can start tracing once"; 84 CHECK(trace_log_ == NULL) << "Can only can start tracing once";
85 trace_log_ = base::debug::TraceLog::GetInstance(); 85 trace_log_ = base::debug::TraceLog::GetInstance();
86 base::debug::TraceOptions trace_options(base::debug::RECORD_UNTIL_FULL);
87 trace_options.enable_sampling = true;
86 trace_log_->SetEnabled(base::debug::CategoryFilter("video"), 88 trace_log_->SetEnabled(base::debug::CategoryFilter("video"),
87 base::debug::TraceLog::RECORDING_MODE, 89 base::debug::TraceLog::RECORDING_MODE,
88 base::debug::TraceLog::ENABLE_SAMPLING); 90 trace_options);
89 // Check that we are indeed recording. 91 // Check that we are indeed recording.
90 EXPECT_EQ(trace_log_->GetNumTracesRecorded(), 1); 92 EXPECT_EQ(trace_log_->GetNumTracesRecorded(), 1);
91 } 93 }
92 94
93 void StopTracing() { 95 void StopTracing() {
94 CHECK(message_loop_runner_ == NULL) << "Calling StopTracing more than once"; 96 CHECK(message_loop_runner_ == NULL) << "Calling StopTracing more than once";
95 trace_log_->SetDisabled(); 97 trace_log_->SetDisabled();
96 message_loop_runner_ = new MessageLoopRunner; 98 message_loop_runner_ = new MessageLoopRunner;
97 trace_log_->Flush(base::Bind( 99 trace_log_->Flush(base::Bind(
98 &WebRtcGetUserMediaBrowserTest::OnTraceDataCollected, 100 &WebRtcGetUserMediaBrowserTest::OnTraceDataCollected,
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 {640, 640, 360, 360, 10, 30}, 613 {640, 640, 360, 360, 10, 30},
612 {640, 640, 480, 480, 10, 30}, 614 {640, 640, 480, 480, 10, 30},
613 {960, 960, 720, 720, 10, 30}, 615 {960, 960, 720, 720, 10, 30},
614 {1280, 1280, 720, 720, 10, 30}}; 616 {1280, 1280, 720, 720, 10, 30}};
615 617
616 INSTANTIATE_TEST_CASE_P(UserMedia, 618 INSTANTIATE_TEST_CASE_P(UserMedia,
617 WebRtcConstraintsBrowserTest, 619 WebRtcConstraintsBrowserTest,
618 testing::ValuesIn(kAllUserMediaSizes)); 620 testing::ValuesIn(kAllUserMediaSizes));
619 621
620 } // namespace content 622 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/devtools/devtools_tracing_handler.cc ('k') | content/browser/tracing/trace_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698