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

Side by Side Diff: base/test/trace_event_analyzer_unittest.cc

Issue 1165673002: [Startup Tracing] Hook up TraceConfig and remove CategoryFilter & TraceOptions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 6 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 | base/test/trace_to_file.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/bind.h" 5 #include "base/bind.h"
6 #include "base/synchronization/waitable_event.h" 6 #include "base/synchronization/waitable_event.h"
7 #include "base/test/trace_event_analyzer.h" 7 #include "base/test/trace_event_analyzer.h"
8 #include "base/threading/platform_thread.h" 8 #include "base/threading/platform_thread.h"
9 #include "testing/gmock/include/gmock/gmock.h" 9 #include "testing/gmock/include/gmock/gmock.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 28 matching lines...) Expand all
39 bool has_more_events) { 39 bool has_more_events) {
40 buffer_.AddFragment(json_events_str->data()); 40 buffer_.AddFragment(json_events_str->data());
41 if (!has_more_events) 41 if (!has_more_events)
42 flush_complete_event->Signal(); 42 flush_complete_event->Signal();
43 } 43 }
44 44
45 void TraceEventAnalyzerTest::BeginTracing() { 45 void TraceEventAnalyzerTest::BeginTracing() {
46 output_.json_output.clear(); 46 output_.json_output.clear();
47 buffer_.Start(); 47 buffer_.Start();
48 base::trace_event::TraceLog::GetInstance()->SetEnabled( 48 base::trace_event::TraceLog::GetInstance()->SetEnabled(
49 base::trace_event::CategoryFilter("*"), 49 base::trace_event::TraceConfig("*", ""),
50 base::trace_event::TraceLog::RECORDING_MODE, 50 base::trace_event::TraceLog::RECORDING_MODE);
51 base::trace_event::TraceOptions());
52 } 51 }
53 52
54 void TraceEventAnalyzerTest::EndTracing() { 53 void TraceEventAnalyzerTest::EndTracing() {
55 base::trace_event::TraceLog::GetInstance()->SetDisabled(); 54 base::trace_event::TraceLog::GetInstance()->SetDisabled();
56 base::WaitableEvent flush_complete_event(false, false); 55 base::WaitableEvent flush_complete_event(false, false);
57 base::trace_event::TraceLog::GetInstance()->Flush( 56 base::trace_event::TraceLog::GetInstance()->Flush(
58 base::Bind(&TraceEventAnalyzerTest::OnTraceDataCollected, 57 base::Bind(&TraceEventAnalyzerTest::OnTraceDataCollected,
59 base::Unretained(this), 58 base::Unretained(this),
60 base::Unretained(&flush_complete_event))); 59 base::Unretained(&flush_complete_event)));
61 flush_complete_event.Wait(); 60 flush_complete_event.Wait();
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 EXPECT_EQ(num_events, CountMatches(event_ptrs, Query::Bool(true))); 885 EXPECT_EQ(num_events, CountMatches(event_ptrs, Query::Bool(true)));
887 EXPECT_EQ(num_events - 1, CountMatches(event_ptrs, Query::Bool(true), 886 EXPECT_EQ(num_events - 1, CountMatches(event_ptrs, Query::Bool(true),
888 1, num_events)); 887 1, num_events));
889 EXPECT_EQ(1u, CountMatches(event_ptrs, query_one)); 888 EXPECT_EQ(1u, CountMatches(event_ptrs, query_one));
890 EXPECT_EQ(num_events - 1, CountMatches(event_ptrs, !query_one)); 889 EXPECT_EQ(num_events - 1, CountMatches(event_ptrs, !query_one));
891 EXPECT_EQ(num_named, CountMatches(event_ptrs, query_named)); 890 EXPECT_EQ(num_named, CountMatches(event_ptrs, query_named));
892 } 891 }
893 892
894 893
895 } // namespace trace_analyzer 894 } // namespace trace_analyzer
OLDNEW
« no previous file with comments | « no previous file | base/test/trace_to_file.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698