| Index: base/debug/trace_event_unittest.cc
|
| diff --git a/base/debug/trace_event_unittest.cc b/base/debug/trace_event_unittest.cc
|
| index 69b574305e2868f444d874983978024c4d3ddc55..eb00f803a7672e773c644aa1b3dfb8747927b073 100644
|
| --- a/base/debug/trace_event_unittest.cc
|
| +++ b/base/debug/trace_event_unittest.cc
|
| @@ -1367,7 +1367,12 @@ TEST_F(TraceEventTestFixture, StaticStringVsString) {
|
| TraceLog* tracer = TraceLog::GetInstance();
|
| // Make sure old events are flushed:
|
| EndTraceAndFlush();
|
| - EXPECT_EQ(0u, tracer->GetEventsSize());
|
| + {
|
| + float unused;
|
| + size_t num_events;
|
| + tracer->GetBufferUsage(&unused, &num_events);
|
| + EXPECT_EQ(0u, num_events);
|
| + }
|
| const unsigned char* category_group_enabled =
|
| TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED("cat");
|
|
|
| @@ -1384,7 +1389,9 @@ TEST_F(TraceEventTestFixture, StaticStringVsString) {
|
| TRACE_EVENT_PHASE_INSTANT, category_group_enabled, "name2", 0, 0,
|
| "arg1", TRACE_STR_COPY("argval"),
|
| "arg2", TRACE_STR_COPY("argval"));
|
| - size_t num_events = tracer->GetEventsSize();
|
| + float unused;
|
| + size_t num_events;
|
| + tracer->GetBufferUsage(&unused, &num_events);
|
| EXPECT_GT(num_events, 1u);
|
| const TraceEvent* event1 = tracer->GetEventByHandle(handle1);
|
| const TraceEvent* event2 = tracer->GetEventByHandle(handle2);
|
| @@ -1414,7 +1421,9 @@ TEST_F(TraceEventTestFixture, StaticStringVsString) {
|
| TRACE_EVENT_PHASE_INSTANT, category_group_enabled, "name2", 0, 0,
|
| "arg1", TRACE_STR_COPY(str1),
|
| "arg2", TRACE_STR_COPY(str2));
|
| - size_t num_events = tracer->GetEventsSize();
|
| + float unused;
|
| + size_t num_events;
|
| + tracer->GetBufferUsage(&unused, &num_events);
|
| EXPECT_GT(num_events, 1u);
|
| const TraceEvent* event1 = tracer->GetEventByHandle(handle1);
|
| const TraceEvent* event2 = tracer->GetEventByHandle(handle2);
|
|
|