Introduce the use of Chromium types (issue #1336).

- Move include/cef_build.h to include/base/cef_build.h.
- Move libcef_dll/cef_macros.h to include/base/cef_macros.h.
- Move include/cef_trace_event.h to include/base/cef_trace_event.h and include/internal/cef_trace_event_internal.h.
- Remove the "CEF_" prefix from TRACE macros.
- Add new include/base/cef_logging.h and include/internal/cef_logging_internal.h for logging support.
- Add new include/wrapper/cef_helpers.h for CEF_REQUIRE_*_THREAD macros and CefScopedArgArray.
- Delete the util.h headers used by tests that duplicated the above functionality.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1767 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-07-11 20:10:05 +00:00
parent b9781aa000
commit 6702fc573a
79 changed files with 2335 additions and 1172 deletions

View File

@ -7,60 +7,60 @@
#include "include/cef_runnable.h"
#include "include/cef_task.h"
#include "include/cef_trace.h"
#include "include/cef_trace_event.h"
#include "include/base/cef_trace_event.h"
#include "tests/unittests/test_handler.h"
#include "testing/gtest/include/gtest/gtest.h"
enum TracingTestType {
CEF_TRACE_EVENT0,
CEF_TRACE_EVENT1,
CEF_TRACE_EVENT2,
CEF_TRACE_EVENT_INSTANT0,
CEF_TRACE_EVENT_INSTANT1,
CEF_TRACE_EVENT_INSTANT2,
CEF_TRACE_EVENT_COPY_INSTANT0,
CEF_TRACE_EVENT_COPY_INSTANT1,
CEF_TRACE_EVENT_COPY_INSTANT2,
CEF_TRACE_EVENT_BEGIN0,
CEF_TRACE_EVENT_BEGIN1,
CEF_TRACE_EVENT_BEGIN2,
CEF_TRACE_EVENT_COPY_BEGIN0,
CEF_TRACE_EVENT_COPY_BEGIN1,
CEF_TRACE_EVENT_COPY_BEGIN2,
CEF_TRACE_EVENT_END0,
CEF_TRACE_EVENT_END1,
CEF_TRACE_EVENT_END2,
CEF_TRACE_EVENT_COPY_END0,
CEF_TRACE_EVENT_COPY_END1,
CEF_TRACE_EVENT_COPY_END2,
CEF_TRACE_COUNTER1,
CEF_TRACE_COPY_COUNTER1,
CEF_TRACE_COUNTER2,
CEF_TRACE_COPY_COUNTER2,
CEF_TRACE_COUNTER_ID1,
CEF_TRACE_COPY_COUNTER_ID1,
CEF_TRACE_COUNTER_ID2,
CEF_TRACE_COPY_COUNTER_ID2,
CEF_TRACE_EVENT_ASYNC_BEGIN0,
CEF_TRACE_EVENT_ASYNC_BEGIN1,
CEF_TRACE_EVENT_ASYNC_BEGIN2,
CEF_TRACE_EVENT_COPY_ASYNC_BEGIN0,
CEF_TRACE_EVENT_COPY_ASYNC_BEGIN1,
CEF_TRACE_EVENT_COPY_ASYNC_BEGIN2,
CEF_TRACE_EVENT_ASYNC_STEP_INTO0,
CEF_TRACE_EVENT_ASYNC_STEP_INTO1,
CEF_TRACE_EVENT_COPY_ASYNC_STEP_INTO0,
CEF_TRACE_EVENT_COPY_ASYNC_STEP_INTO1,
CEF_TRACE_EVENT_ASYNC_STEP_PAST0,
CEF_TRACE_EVENT_ASYNC_STEP_PAST1,
CEF_TRACE_EVENT_COPY_ASYNC_STEP_PAST0,
CEF_TRACE_EVENT_COPY_ASYNC_STEP_PAST1,
CEF_TRACE_EVENT_ASYNC_END0,
CEF_TRACE_EVENT_ASYNC_END1,
CEF_TRACE_EVENT_ASYNC_END2,
CEF_TRACE_EVENT_COPY_ASYNC_END0,
CEF_TRACE_EVENT_COPY_ASYNC_END1,
CEF_TRACE_EVENT_COPY_ASYNC_END2
TT_TRACE_EVENT0,
TT_TRACE_EVENT1,
TT_TRACE_EVENT2,
TT_TRACE_EVENT_INSTANT0,
TT_TRACE_EVENT_INSTANT1,
TT_TRACE_EVENT_INSTANT2,
TT_TRACE_EVENT_COPY_INSTANT0,
TT_TRACE_EVENT_COPY_INSTANT1,
TT_TRACE_EVENT_COPY_INSTANT2,
TT_TRACE_EVENT_BEGIN0,
TT_TRACE_EVENT_BEGIN1,
TT_TRACE_EVENT_BEGIN2,
TT_TRACE_EVENT_COPY_BEGIN0,
TT_TRACE_EVENT_COPY_BEGIN1,
TT_TRACE_EVENT_COPY_BEGIN2,
TT_TRACE_EVENT_END0,
TT_TRACE_EVENT_END1,
TT_TRACE_EVENT_END2,
TT_TRACE_EVENT_COPY_END0,
TT_TRACE_EVENT_COPY_END1,
TT_TRACE_EVENT_COPY_END2,
TT_TRACE_COUNTER1,
TT_TRACE_COPY_COUNTER1,
TT_TRACE_COUNTER2,
TT_TRACE_COPY_COUNTER2,
TT_TRACE_COUNTER_ID1,
TT_TRACE_COPY_COUNTER_ID1,
TT_TRACE_COUNTER_ID2,
TT_TRACE_COPY_COUNTER_ID2,
TT_TRACE_EVENT_ASYNC_BEGIN0,
TT_TRACE_EVENT_ASYNC_BEGIN1,
TT_TRACE_EVENT_ASYNC_BEGIN2,
TT_TRACE_EVENT_COPY_ASYNC_BEGIN0,
TT_TRACE_EVENT_COPY_ASYNC_BEGIN1,
TT_TRACE_EVENT_COPY_ASYNC_BEGIN2,
TT_TRACE_EVENT_ASYNC_STEP_INTO0,
TT_TRACE_EVENT_ASYNC_STEP_INTO1,
TT_TRACE_EVENT_COPY_ASYNC_STEP_INTO0,
TT_TRACE_EVENT_COPY_ASYNC_STEP_INTO1,
TT_TRACE_EVENT_ASYNC_STEP_PAST0,
TT_TRACE_EVENT_ASYNC_STEP_PAST1,
TT_TRACE_EVENT_COPY_ASYNC_STEP_PAST0,
TT_TRACE_EVENT_COPY_ASYNC_STEP_PAST1,
TT_TRACE_EVENT_ASYNC_END0,
TT_TRACE_EVENT_ASYNC_END1,
TT_TRACE_EVENT_ASYNC_END2,
TT_TRACE_EVENT_COPY_ASYNC_END0,
TT_TRACE_EVENT_COPY_ASYNC_END1,
TT_TRACE_EVENT_COPY_ASYNC_END2
};
const char kTraceTestCategory[] = "test_category";
@ -104,217 +104,213 @@ class TracingTestHandler : public CefEndTracingCallback,
EXPECT_UI_THREAD();
switch (type_) {
case CEF_TRACE_EVENT0: {
CEF_TRACE_EVENT0(kTraceTestCategory, "CEF_TRACE_EVENT0");
case TT_TRACE_EVENT0: {
TRACE_EVENT0(kTraceTestCategory, "TT_TRACE_EVENT0");
} break;
case CEF_TRACE_EVENT1: {
CEF_TRACE_EVENT1(kTraceTestCategory, "CEF_TRACE_EVENT1", "arg1", 1);
case TT_TRACE_EVENT1: {
TRACE_EVENT1(kTraceTestCategory, "TT_TRACE_EVENT1", "arg1", 1);
} break;
case CEF_TRACE_EVENT2: {
CEF_TRACE_EVENT2(kTraceTestCategory, "CEF_TRACE_EVENT2", "arg1", 1,
"arg2", 2);
case TT_TRACE_EVENT2: {
TRACE_EVENT2(kTraceTestCategory, "TT_TRACE_EVENT2", "arg1", 1,
"arg2", 2);
} break;
case CEF_TRACE_EVENT_INSTANT0:
CEF_TRACE_EVENT_INSTANT0(kTraceTestCategory,
"CEF_TRACE_EVENT_INSTANT0");
case TT_TRACE_EVENT_INSTANT0:
TRACE_EVENT_INSTANT0(kTraceTestCategory,
"TT_TRACE_EVENT_INSTANT0");
break;
case CEF_TRACE_EVENT_INSTANT1:
CEF_TRACE_EVENT_INSTANT1(kTraceTestCategory, "CEF_TRACE_EVENT_INSTANT1",
"arg1", 1);
break;
case CEF_TRACE_EVENT_INSTANT2:
CEF_TRACE_EVENT_INSTANT2(kTraceTestCategory, "CEF_TRACE_EVENT_INSTANT2",
"arg1", 1, "arg2", 2);
break;
case CEF_TRACE_EVENT_COPY_INSTANT0:
CEF_TRACE_EVENT_COPY_INSTANT0(kTraceTestCategory,
"CEF_TRACE_EVENT_COPY_INSTANT0");
break;
case CEF_TRACE_EVENT_COPY_INSTANT1:
CEF_TRACE_EVENT_COPY_INSTANT1(kTraceTestCategory,
"CEF_TRACE_EVENT_COPY_INSTANT1",
"arg1", 1);
break;
case CEF_TRACE_EVENT_COPY_INSTANT2:
CEF_TRACE_EVENT_COPY_INSTANT2(kTraceTestCategory,
"CEF_TRACE_EVENT_COPY_INSTANT2",
"arg1", 1, "arg2", 2);
break;
case CEF_TRACE_EVENT_BEGIN0:
CEF_TRACE_EVENT_BEGIN0(kTraceTestCategory, "CEF_TRACE_EVENT_BEGIN0");
break;
case CEF_TRACE_EVENT_BEGIN1:
CEF_TRACE_EVENT_BEGIN1(kTraceTestCategory, "CEF_TRACE_EVENT_BEGIN1",
"arg1", 1);
break;
case CEF_TRACE_EVENT_BEGIN2:
CEF_TRACE_EVENT_BEGIN2(kTraceTestCategory, "CEF_TRACE_EVENT_BEGIN2",
"arg1", 1, "arg2", 2);
break;
case CEF_TRACE_EVENT_COPY_BEGIN0:
CEF_TRACE_EVENT_COPY_BEGIN0(kTraceTestCategory,
"CEF_TRACE_EVENT_COPY_BEGIN0");
break;
case CEF_TRACE_EVENT_COPY_BEGIN1:
CEF_TRACE_EVENT_COPY_BEGIN1(kTraceTestCategory,
"CEF_TRACE_EVENT_COPY_BEGIN1",
"arg1", 1);
break;
case CEF_TRACE_EVENT_COPY_BEGIN2:
CEF_TRACE_EVENT_COPY_BEGIN2(kTraceTestCategory,
"CEF_TRACE_EVENT_COPY_BEGIN2",
"arg1", 1, "arg2", 2);
break;
case CEF_TRACE_EVENT_END0:
CEF_TRACE_EVENT_END0(kTraceTestCategory, "CEF_TRACE_EVENT_END0");
break;
case CEF_TRACE_EVENT_END1:
CEF_TRACE_EVENT_END1(kTraceTestCategory, "CEF_TRACE_EVENT_END1",
case TT_TRACE_EVENT_INSTANT1:
TRACE_EVENT_INSTANT1(kTraceTestCategory, "TT_TRACE_EVENT_INSTANT1",
"arg1", 1);
break;
case CEF_TRACE_EVENT_END2:
CEF_TRACE_EVENT_END2(kTraceTestCategory, "CEF_TRACE_EVENT_END2",
case TT_TRACE_EVENT_INSTANT2:
TRACE_EVENT_INSTANT2(kTraceTestCategory, "TT_TRACE_EVENT_INSTANT2",
"arg1", 1, "arg2", 2);
break;
case CEF_TRACE_EVENT_COPY_END0:
CEF_TRACE_EVENT_COPY_END0(kTraceTestCategory,
"CEF_TRACE_EVENT_COPY_END0");
case TT_TRACE_EVENT_COPY_INSTANT0:
TRACE_EVENT_COPY_INSTANT0(kTraceTestCategory,
"TT_TRACE_EVENT_COPY_INSTANT0");
break;
case CEF_TRACE_EVENT_COPY_END1:
CEF_TRACE_EVENT_COPY_END1(kTraceTestCategory,
"CEF_TRACE_EVENT_COPY_END1", "arg1", 1);
case TT_TRACE_EVENT_COPY_INSTANT1:
TRACE_EVENT_COPY_INSTANT1(kTraceTestCategory,
"TT_TRACE_EVENT_COPY_INSTANT1",
"arg1", 1);
break;
case CEF_TRACE_EVENT_COPY_END2:
CEF_TRACE_EVENT_COPY_END2(kTraceTestCategory,
"CEF_TRACE_EVENT_COPY_END2", "arg1", 1,
"arg2", 2);
case TT_TRACE_EVENT_COPY_INSTANT2:
TRACE_EVENT_COPY_INSTANT2(kTraceTestCategory,
"TT_TRACE_EVENT_COPY_INSTANT2",
"arg1", 1, "arg2", 2);
break;
case CEF_TRACE_COUNTER1:
CEF_TRACE_COUNTER1(kTraceTestCategory, "CEF_TRACE_COUNTER1", 5);
case TT_TRACE_EVENT_BEGIN0:
TRACE_EVENT_BEGIN0(kTraceTestCategory, "TT_TRACE_EVENT_BEGIN0");
break;
case CEF_TRACE_COPY_COUNTER1:
CEF_TRACE_COPY_COUNTER1(kTraceTestCategory, "CEF_TRACE_COPY_COUNTER1",
5);
case TT_TRACE_EVENT_BEGIN1:
TRACE_EVENT_BEGIN1(kTraceTestCategory, "TT_TRACE_EVENT_BEGIN1",
"arg1", 1);
break;
case CEF_TRACE_COUNTER2:
CEF_TRACE_COUNTER2(kTraceTestCategory, "CEF_TRACE_COUNTER2", "val1", 5,
"val2", 10);
case TT_TRACE_EVENT_BEGIN2:
TRACE_EVENT_BEGIN2(kTraceTestCategory, "TT_TRACE_EVENT_BEGIN2",
"arg1", 1, "arg2", 2);
break;
case CEF_TRACE_COPY_COUNTER2:
CEF_TRACE_COPY_COUNTER2(kTraceTestCategory, "CEF_TRACE_COPY_COUNTER2",
"val1", 5, "val2", 10);
case TT_TRACE_EVENT_COPY_BEGIN0:
TRACE_EVENT_COPY_BEGIN0(kTraceTestCategory,
"TT_TRACE_EVENT_COPY_BEGIN0");
break;
case CEF_TRACE_COUNTER_ID1:
CEF_TRACE_COUNTER_ID1(kTraceTestCategory, "CEF_TRACE_COUNTER_ID1", 100,
5);
case TT_TRACE_EVENT_COPY_BEGIN1:
TRACE_EVENT_COPY_BEGIN1(kTraceTestCategory,
"TT_TRACE_EVENT_COPY_BEGIN1",
"arg1", 1);
break;
case CEF_TRACE_COPY_COUNTER_ID1:
CEF_TRACE_COPY_COUNTER_ID1(kTraceTestCategory,
"CEF_TRACE_COPY_COUNTER_ID1", 100, 5);
case TT_TRACE_EVENT_COPY_BEGIN2:
TRACE_EVENT_COPY_BEGIN2(kTraceTestCategory,
"TT_TRACE_EVENT_COPY_BEGIN2",
"arg1", 1, "arg2", 2);
break;
case CEF_TRACE_COUNTER_ID2:
CEF_TRACE_COUNTER_ID2(kTraceTestCategory, "CEF_TRACE_COUNTER_ID2", 100,
"val1", 5, "val2", 10);
case TT_TRACE_EVENT_END0:
TRACE_EVENT_END0(kTraceTestCategory, "TT_TRACE_EVENT_END0");
break;
case CEF_TRACE_COPY_COUNTER_ID2:
CEF_TRACE_COPY_COUNTER_ID2(kTraceTestCategory,
"CEF_TRACE_COPY_COUNTER_ID2", 100,
"val1", 5, "val2", 10);
case TT_TRACE_EVENT_END1:
TRACE_EVENT_END1(kTraceTestCategory, "TT_TRACE_EVENT_END1",
"arg1", 1);
break;
case CEF_TRACE_EVENT_ASYNC_BEGIN0:
CEF_TRACE_EVENT_ASYNC_BEGIN0(kTraceTestCategory,
"CEF_TRACE_EVENT_ASYNC_BEGIN0", 100);
case TT_TRACE_EVENT_END2:
TRACE_EVENT_END2(kTraceTestCategory, "TT_TRACE_EVENT_END2",
"arg1", 1, "arg2", 2);
break;
case CEF_TRACE_EVENT_ASYNC_BEGIN1:
CEF_TRACE_EVENT_ASYNC_BEGIN1(kTraceTestCategory,
"CEF_TRACE_EVENT_ASYNC_BEGIN1", 100,
"arg1", 1);
case TT_TRACE_EVENT_COPY_END0:
TRACE_EVENT_COPY_END0(kTraceTestCategory,
"TT_TRACE_EVENT_COPY_END0");
break;
case CEF_TRACE_EVENT_ASYNC_BEGIN2:
CEF_TRACE_EVENT_ASYNC_BEGIN2(kTraceTestCategory,
"CEF_TRACE_EVENT_ASYNC_BEGIN2",
100, "arg1", 1, "arg2", 2);
case TT_TRACE_EVENT_COPY_END1:
TRACE_EVENT_COPY_END1(kTraceTestCategory,
"TT_TRACE_EVENT_COPY_END1", "arg1", 1);
break;
case CEF_TRACE_EVENT_COPY_ASYNC_BEGIN0:
CEF_TRACE_EVENT_COPY_ASYNC_BEGIN0(kTraceTestCategory,
"CEF_TRACE_EVENT_COPY_ASYNC_BEGIN0",
100);
case TT_TRACE_EVENT_COPY_END2:
TRACE_EVENT_COPY_END2(kTraceTestCategory,
"TT_TRACE_EVENT_COPY_END2", "arg1", 1, "arg2", 2);
break;
case CEF_TRACE_EVENT_COPY_ASYNC_BEGIN1:
CEF_TRACE_EVENT_COPY_ASYNC_BEGIN1(kTraceTestCategory,
"CEF_TRACE_EVENT_COPY_ASYNC_BEGIN1",
100, "arg1", 1);
case TT_TRACE_COUNTER1:
TRACE_COUNTER1(kTraceTestCategory, "TT_TRACE_COUNTER1", 5);
break;
case CEF_TRACE_EVENT_COPY_ASYNC_BEGIN2:
CEF_TRACE_EVENT_COPY_ASYNC_BEGIN2(kTraceTestCategory,
"CEF_TRACE_EVENT_COPY_ASYNC_BEGIN2",
100, "arg1", 1, "arg2", 2);
case TT_TRACE_COPY_COUNTER1:
TRACE_COPY_COUNTER1(kTraceTestCategory, "TT_TRACE_COPY_COUNTER1", 5);
break;
case CEF_TRACE_EVENT_ASYNC_STEP_INTO0:
CEF_TRACE_EVENT_ASYNC_STEP_INTO0(
kTraceTestCategory, "CEF_TRACE_EVENT_ASYNC_STEP_INTO0", 100, 1000);
case TT_TRACE_COUNTER2:
TRACE_COUNTER2(kTraceTestCategory, "TT_TRACE_COUNTER2", "val1", 5,
"val2", 10);
break;
case CEF_TRACE_EVENT_ASYNC_STEP_INTO1:
CEF_TRACE_EVENT_ASYNC_STEP_INTO1(
kTraceTestCategory, "CEF_TRACE_EVENT_ASYNC_STEP_INTO1", 100, 1000,
case TT_TRACE_COPY_COUNTER2:
TRACE_COPY_COUNTER2(kTraceTestCategory, "TT_TRACE_COPY_COUNTER2",
"val1", 5, "val2", 10);
break;
case TT_TRACE_COUNTER_ID1:
TRACE_COUNTER_ID1(kTraceTestCategory, "TT_TRACE_COUNTER_ID1", 100, 5);
break;
case TT_TRACE_COPY_COUNTER_ID1:
TRACE_COPY_COUNTER_ID1(kTraceTestCategory,
"TT_TRACE_COPY_COUNTER_ID1", 100, 5);
break;
case TT_TRACE_COUNTER_ID2:
TRACE_COUNTER_ID2(kTraceTestCategory, "TT_TRACE_COUNTER_ID2", 100,
"val1", 5, "val2", 10);
break;
case TT_TRACE_COPY_COUNTER_ID2:
TRACE_COPY_COUNTER_ID2(kTraceTestCategory,
"TT_TRACE_COPY_COUNTER_ID2", 100,
"val1", 5, "val2", 10);
break;
case TT_TRACE_EVENT_ASYNC_BEGIN0:
TRACE_EVENT_ASYNC_BEGIN0(kTraceTestCategory,
"TT_TRACE_EVENT_ASYNC_BEGIN0", 100);
break;
case TT_TRACE_EVENT_ASYNC_BEGIN1:
TRACE_EVENT_ASYNC_BEGIN1(kTraceTestCategory,
"TT_TRACE_EVENT_ASYNC_BEGIN1", 100, "arg1", 1);
break;
case TT_TRACE_EVENT_ASYNC_BEGIN2:
TRACE_EVENT_ASYNC_BEGIN2(kTraceTestCategory,
"TT_TRACE_EVENT_ASYNC_BEGIN2",
100, "arg1", 1, "arg2", 2);
break;
case TT_TRACE_EVENT_COPY_ASYNC_BEGIN0:
TRACE_EVENT_COPY_ASYNC_BEGIN0(kTraceTestCategory,
"TT_TRACE_EVENT_COPY_ASYNC_BEGIN0",
100);
break;
case TT_TRACE_EVENT_COPY_ASYNC_BEGIN1:
TRACE_EVENT_COPY_ASYNC_BEGIN1(kTraceTestCategory,
"TT_TRACE_EVENT_COPY_ASYNC_BEGIN1",
100, "arg1", 1);
break;
case TT_TRACE_EVENT_COPY_ASYNC_BEGIN2:
TRACE_EVENT_COPY_ASYNC_BEGIN2(kTraceTestCategory,
"TT_TRACE_EVENT_COPY_ASYNC_BEGIN2",
100, "arg1", 1, "arg2", 2);
break;
case TT_TRACE_EVENT_ASYNC_STEP_INTO0:
TRACE_EVENT_ASYNC_STEP_INTO0(
kTraceTestCategory, "TT_TRACE_EVENT_ASYNC_STEP_INTO0", 100, 1000);
break;
case TT_TRACE_EVENT_ASYNC_STEP_INTO1:
TRACE_EVENT_ASYNC_STEP_INTO1(
kTraceTestCategory, "TT_TRACE_EVENT_ASYNC_STEP_INTO1", 100, 1000,
"arg1", 1);
break;
case CEF_TRACE_EVENT_COPY_ASYNC_STEP_INTO0:
CEF_TRACE_EVENT_COPY_ASYNC_STEP_INTO0(
kTraceTestCategory, "CEF_TRACE_EVENT_COPY_ASYNC_STEP_INTO0", 100,
case TT_TRACE_EVENT_COPY_ASYNC_STEP_INTO0:
TRACE_EVENT_COPY_ASYNC_STEP_INTO0(
kTraceTestCategory, "TT_TRACE_EVENT_COPY_ASYNC_STEP_INTO0", 100,
1000);
break;
case CEF_TRACE_EVENT_COPY_ASYNC_STEP_INTO1:
CEF_TRACE_EVENT_COPY_ASYNC_STEP_INTO1(
kTraceTestCategory, "CEF_TRACE_EVENT_COPY_ASYNC_STEP_INTO1", 100,
case TT_TRACE_EVENT_COPY_ASYNC_STEP_INTO1:
TRACE_EVENT_COPY_ASYNC_STEP_INTO1(
kTraceTestCategory, "TT_TRACE_EVENT_COPY_ASYNC_STEP_INTO1", 100,
1000, "arg1", 1);
break;
case CEF_TRACE_EVENT_ASYNC_STEP_PAST0:
CEF_TRACE_EVENT_ASYNC_STEP_PAST0(
kTraceTestCategory, "CEF_TRACE_EVENT_ASYNC_STEP_PAST0", 100, 1000);
case TT_TRACE_EVENT_ASYNC_STEP_PAST0:
TRACE_EVENT_ASYNC_STEP_PAST0(
kTraceTestCategory, "TT_TRACE_EVENT_ASYNC_STEP_PAST0", 100, 1000);
break;
case CEF_TRACE_EVENT_ASYNC_STEP_PAST1:
CEF_TRACE_EVENT_ASYNC_STEP_PAST1(
kTraceTestCategory, "CEF_TRACE_EVENT_ASYNC_STEP_PAST1", 100, 1000,
case TT_TRACE_EVENT_ASYNC_STEP_PAST1:
TRACE_EVENT_ASYNC_STEP_PAST1(
kTraceTestCategory, "TT_TRACE_EVENT_ASYNC_STEP_PAST1", 100, 1000,
"arg1", 1);
break;
case CEF_TRACE_EVENT_COPY_ASYNC_STEP_PAST0:
CEF_TRACE_EVENT_COPY_ASYNC_STEP_PAST0(
kTraceTestCategory, "CEF_TRACE_EVENT_COPY_ASYNC_STEP_PAST0", 100,
case TT_TRACE_EVENT_COPY_ASYNC_STEP_PAST0:
TRACE_EVENT_COPY_ASYNC_STEP_PAST0(
kTraceTestCategory, "TT_TRACE_EVENT_COPY_ASYNC_STEP_PAST0", 100,
1000);
break;
case CEF_TRACE_EVENT_COPY_ASYNC_STEP_PAST1:
CEF_TRACE_EVENT_COPY_ASYNC_STEP_PAST1(
kTraceTestCategory, "CEF_TRACE_EVENT_COPY_ASYNC_STEP_PAST1", 100,
case TT_TRACE_EVENT_COPY_ASYNC_STEP_PAST1:
TRACE_EVENT_COPY_ASYNC_STEP_PAST1(
kTraceTestCategory, "TT_TRACE_EVENT_COPY_ASYNC_STEP_PAST1", 100,
1000, "arg1", 1);
break;
case CEF_TRACE_EVENT_ASYNC_END0:
CEF_TRACE_EVENT_ASYNC_END0(kTraceTestCategory,
"CEF_TRACE_EVENT_ASYNC_END0", 100);
case TT_TRACE_EVENT_ASYNC_END0:
TRACE_EVENT_ASYNC_END0(kTraceTestCategory,
"TT_TRACE_EVENT_ASYNC_END0", 100);
break;
case CEF_TRACE_EVENT_ASYNC_END1:
CEF_TRACE_EVENT_ASYNC_END1(kTraceTestCategory,
"CEF_TRACE_EVENT_ASYNC_END1", 100,
"arg1", 1);
case TT_TRACE_EVENT_ASYNC_END1:
TRACE_EVENT_ASYNC_END1(kTraceTestCategory,
"TT_TRACE_EVENT_ASYNC_END1", 100,
"arg1", 1);
break;
case CEF_TRACE_EVENT_ASYNC_END2:
CEF_TRACE_EVENT_ASYNC_END2(kTraceTestCategory,
"CEF_TRACE_EVENT_ASYNC_END2", 100,
"arg1", 1, "arg2", 2);
case CEF_TRACE_EVENT_COPY_ASYNC_END0:
CEF_TRACE_EVENT_COPY_ASYNC_END0(kTraceTestCategory,
"CEF_TRACE_EVENT_COPY_ASYNC_END0",
100);
case TT_TRACE_EVENT_ASYNC_END2:
TRACE_EVENT_ASYNC_END2(kTraceTestCategory,
"TT_TRACE_EVENT_ASYNC_END2", 100,
"arg1", 1, "arg2", 2);
case TT_TRACE_EVENT_COPY_ASYNC_END0:
TRACE_EVENT_COPY_ASYNC_END0(kTraceTestCategory,
"TT_TRACE_EVENT_COPY_ASYNC_END0",
100);
break;
case CEF_TRACE_EVENT_COPY_ASYNC_END1:
CEF_TRACE_EVENT_COPY_ASYNC_END1(kTraceTestCategory,
"CEF_TRACE_EVENT_COPY_ASYNC_END1",
100, "arg1", 1);
case TT_TRACE_EVENT_COPY_ASYNC_END1:
TRACE_EVENT_COPY_ASYNC_END1(kTraceTestCategory,
"TT_TRACE_EVENT_COPY_ASYNC_END1",
100, "arg1", 1);
break;
case CEF_TRACE_EVENT_COPY_ASYNC_END2:
CEF_TRACE_EVENT_COPY_ASYNC_END2(kTraceTestCategory,
"CEF_TRACE_EVENT_COPY_ASYNC_END2",
100, "arg1", 1, "arg2", 2);
case TT_TRACE_EVENT_COPY_ASYNC_END2:
TRACE_EVENT_COPY_ASYNC_END2(kTraceTestCategory,
"TT_TRACE_EVENT_COPY_ASYNC_END2",
100, "arg1", 1, "arg2", 2);
break;
}
@ -358,64 +354,64 @@ class TracingTestHandler : public CefEndTracingCallback,
}
// Define the tests.
TRACING_TEST(TraceEvent0, CEF_TRACE_EVENT0);
TRACING_TEST(TraceEvent1, CEF_TRACE_EVENT1);
TRACING_TEST(TraceEvent2, CEF_TRACE_EVENT2);
TRACING_TEST(TraceEventInstant0, CEF_TRACE_EVENT_INSTANT0);
TRACING_TEST(TraceEventInstant1, CEF_TRACE_EVENT_INSTANT1);
TRACING_TEST(TraceEventInstant2, CEF_TRACE_EVENT_INSTANT2);
TRACING_TEST(TraceEventCopyInstant0, CEF_TRACE_EVENT_COPY_INSTANT0);
TRACING_TEST(TraceEventCopyInstant1, CEF_TRACE_EVENT_COPY_INSTANT1);
TRACING_TEST(TraceEventCopyInstant2, CEF_TRACE_EVENT_COPY_INSTANT2);
TRACING_TEST(TraceEventBegin0, CEF_TRACE_EVENT_BEGIN0);
TRACING_TEST(TraceEventBegin1, CEF_TRACE_EVENT_BEGIN1);
TRACING_TEST(TraceEventBegin2, CEF_TRACE_EVENT_BEGIN2);
TRACING_TEST(TraceEventCopyBegin0, CEF_TRACE_EVENT_COPY_BEGIN0);
TRACING_TEST(TraceEventCopyBegin1, CEF_TRACE_EVENT_COPY_BEGIN1);
TRACING_TEST(TraceEventCopyBegin2, CEF_TRACE_EVENT_COPY_BEGIN2);
TRACING_TEST(TraceEventEnd0, CEF_TRACE_EVENT_END0);
TRACING_TEST(TraceEventEnd1, CEF_TRACE_EVENT_END1);
TRACING_TEST(TraceEventEnd2, CEF_TRACE_EVENT_END2);
TRACING_TEST(TraceEventCopyEnd0, CEF_TRACE_EVENT_COPY_END0);
TRACING_TEST(TraceEventCopyEnd1, CEF_TRACE_EVENT_COPY_END1);
TRACING_TEST(TraceEventCopyEnd2, CEF_TRACE_EVENT_COPY_END1);
TRACING_TEST(TraceCounter1, CEF_TRACE_COUNTER1);
TRACING_TEST(TraceCopyCounter1, CEF_TRACE_COPY_COUNTER1);
TRACING_TEST(TraceCounter2, CEF_TRACE_COUNTER2);
TRACING_TEST(TraceCopyCounter2, CEF_TRACE_COPY_COUNTER2);
TRACING_TEST(TraceCounterId1, CEF_TRACE_COUNTER_ID1);
TRACING_TEST(TraceCopyCounterId1, CEF_TRACE_COPY_COUNTER_ID1);
TRACING_TEST(TraceCounterId2, CEF_TRACE_COUNTER_ID2);
TRACING_TEST(TraceCopyCounterId2, CEF_TRACE_COPY_COUNTER_ID1);
TRACING_TEST(TraceEventAsyncBegin0, CEF_TRACE_EVENT_ASYNC_BEGIN0);
TRACING_TEST(TraceEventAsyncBegin1, CEF_TRACE_EVENT_ASYNC_BEGIN1);
TRACING_TEST(TraceEventAsyncBegin2, CEF_TRACE_EVENT_ASYNC_BEGIN2);
TRACING_TEST(TraceEvent0, TT_TRACE_EVENT0);
TRACING_TEST(TraceEvent1, TT_TRACE_EVENT1);
TRACING_TEST(TraceEvent2, TT_TRACE_EVENT2);
TRACING_TEST(TraceEventInstant0, TT_TRACE_EVENT_INSTANT0);
TRACING_TEST(TraceEventInstant1, TT_TRACE_EVENT_INSTANT1);
TRACING_TEST(TraceEventInstant2, TT_TRACE_EVENT_INSTANT2);
TRACING_TEST(TraceEventCopyInstant0, TT_TRACE_EVENT_COPY_INSTANT0);
TRACING_TEST(TraceEventCopyInstant1, TT_TRACE_EVENT_COPY_INSTANT1);
TRACING_TEST(TraceEventCopyInstant2, TT_TRACE_EVENT_COPY_INSTANT2);
TRACING_TEST(TraceEventBegin0, TT_TRACE_EVENT_BEGIN0);
TRACING_TEST(TraceEventBegin1, TT_TRACE_EVENT_BEGIN1);
TRACING_TEST(TraceEventBegin2, TT_TRACE_EVENT_BEGIN2);
TRACING_TEST(TraceEventCopyBegin0, TT_TRACE_EVENT_COPY_BEGIN0);
TRACING_TEST(TraceEventCopyBegin1, TT_TRACE_EVENT_COPY_BEGIN1);
TRACING_TEST(TraceEventCopyBegin2, TT_TRACE_EVENT_COPY_BEGIN2);
TRACING_TEST(TraceEventEnd0, TT_TRACE_EVENT_END0);
TRACING_TEST(TraceEventEnd1, TT_TRACE_EVENT_END1);
TRACING_TEST(TraceEventEnd2, TT_TRACE_EVENT_END2);
TRACING_TEST(TraceEventCopyEnd0, TT_TRACE_EVENT_COPY_END0);
TRACING_TEST(TraceEventCopyEnd1, TT_TRACE_EVENT_COPY_END1);
TRACING_TEST(TraceEventCopyEnd2, TT_TRACE_EVENT_COPY_END1);
TRACING_TEST(TraceCounter1, TT_TRACE_COUNTER1);
TRACING_TEST(TraceCopyCounter1, TT_TRACE_COPY_COUNTER1);
TRACING_TEST(TraceCounter2, TT_TRACE_COUNTER2);
TRACING_TEST(TraceCopyCounter2, TT_TRACE_COPY_COUNTER2);
TRACING_TEST(TraceCounterId1, TT_TRACE_COUNTER_ID1);
TRACING_TEST(TraceCopyCounterId1, TT_TRACE_COPY_COUNTER_ID1);
TRACING_TEST(TraceCounterId2, TT_TRACE_COUNTER_ID2);
TRACING_TEST(TraceCopyCounterId2, TT_TRACE_COPY_COUNTER_ID1);
TRACING_TEST(TraceEventAsyncBegin0, TT_TRACE_EVENT_ASYNC_BEGIN0);
TRACING_TEST(TraceEventAsyncBegin1, TT_TRACE_EVENT_ASYNC_BEGIN1);
TRACING_TEST(TraceEventAsyncBegin2, TT_TRACE_EVENT_ASYNC_BEGIN2);
TRACING_TEST(TraceEventCopyAsyncBegin0,
CEF_TRACE_EVENT_COPY_ASYNC_BEGIN0);
TT_TRACE_EVENT_COPY_ASYNC_BEGIN0);
TRACING_TEST(TraceEventCopyAsyncBegin1,
CEF_TRACE_EVENT_COPY_ASYNC_BEGIN1);
TT_TRACE_EVENT_COPY_ASYNC_BEGIN1);
TRACING_TEST(TraceEventCopyAsyncBegin2,
CEF_TRACE_EVENT_COPY_ASYNC_BEGIN2);
TT_TRACE_EVENT_COPY_ASYNC_BEGIN2);
TRACING_TEST(TraceEventAsyncStepInto0,
CEF_TRACE_EVENT_ASYNC_STEP_INTO0);
TT_TRACE_EVENT_ASYNC_STEP_INTO0);
TRACING_TEST(TraceEventAsyncStepInto1,
CEF_TRACE_EVENT_ASYNC_STEP_INTO1);
TT_TRACE_EVENT_ASYNC_STEP_INTO1);
TRACING_TEST(TraceEventCopyAsyncStepInto0,
CEF_TRACE_EVENT_COPY_ASYNC_STEP_INTO0);
TT_TRACE_EVENT_COPY_ASYNC_STEP_INTO0);
TRACING_TEST(TraceEventCopyAsyncStepInto1,
CEF_TRACE_EVENT_COPY_ASYNC_STEP_INTO1);
TT_TRACE_EVENT_COPY_ASYNC_STEP_INTO1);
TRACING_TEST(TraceEventAsyncStepPast0,
CEF_TRACE_EVENT_ASYNC_STEP_PAST0);
TT_TRACE_EVENT_ASYNC_STEP_PAST0);
TRACING_TEST(TraceEventAsyncStepPast1,
CEF_TRACE_EVENT_ASYNC_STEP_PAST1);
TT_TRACE_EVENT_ASYNC_STEP_PAST1);
TRACING_TEST(TraceEventCopyAsyncStepPast0,
CEF_TRACE_EVENT_COPY_ASYNC_STEP_PAST0);
TT_TRACE_EVENT_COPY_ASYNC_STEP_PAST0);
TRACING_TEST(TraceEventCopyAsyncStepPast1,
CEF_TRACE_EVENT_COPY_ASYNC_STEP_PAST1);
TRACING_TEST(TraceEventAsyncEnd0, CEF_TRACE_EVENT_ASYNC_END0);
TRACING_TEST(TraceEventAsyncEnd1, CEF_TRACE_EVENT_ASYNC_END1);
TRACING_TEST(TraceEventAsyncEnd2, CEF_TRACE_EVENT_ASYNC_END2);
TRACING_TEST(TraceEventCopyAsyncEnd0, CEF_TRACE_EVENT_COPY_ASYNC_END0);
TT_TRACE_EVENT_COPY_ASYNC_STEP_PAST1);
TRACING_TEST(TraceEventAsyncEnd0, TT_TRACE_EVENT_ASYNC_END0);
TRACING_TEST(TraceEventAsyncEnd1, TT_TRACE_EVENT_ASYNC_END1);
TRACING_TEST(TraceEventAsyncEnd2, TT_TRACE_EVENT_ASYNC_END2);
TRACING_TEST(TraceEventCopyAsyncEnd0, TT_TRACE_EVENT_COPY_ASYNC_END0);
TEST(TracingTest, NowFromSystemTraceTime) {