base/trace_event/trace_event.h - Issue 1852433005: Convert //base to use std::unique_ptr

Unified Diff: base/trace_event/trace_event.h

Issue 1852433005: Convert //base to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase after r384946 Created 4 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 side-by-side diff with in-line comments

Download patch

Index: base/trace_event/trace_event.h

diff --git a/base/trace_event/trace_event.h b/base/trace_event/trace_event.h

index e7801e6eb7d6d3cca01bf8d9d68e704bce6354b4..ef452f642f2ee7f419d0f213a77180a05accbc7d 100644

--- a/base/trace_event/trace_event.h

+++ b/base/trace_event/trace_event.h

@@ -111,7 +111,7 @@

// const char** arg_names,

// const unsigned char* arg_types,

// const unsigned long long* arg_values,

-// scoped_ptr<ConvertableToTraceFormat>*

+// std::unique_ptr<ConvertableToTraceFormat>*

// convertable_values,

// unsigned int flags)

#define TRACE_EVENT_API_ADD_TRACE_EVENT \

@@ -130,7 +130,7 @@

// const char** arg_names,

// const unsigned char* arg_types,

// const unsigned long long* arg_values,

-// scoped_ptr<ConvertableToTraceFormat>*

+// std::unique_ptr<ConvertableToTraceFormat>*

// convertable_values,

// unsigned int flags)

#define TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_BIND_ID \

@@ -150,7 +150,7 @@

// const char** arg_names,

// const unsigned char* arg_types,

// const unsigned long long* arg_values,

-// scoped_ptr<ConvertableToTraceFormat>*

+// std::unique_ptr<ConvertableToTraceFormat>*

// convertable_values,

// unsigned int flags)

#define TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_PROCESS_ID \

@@ -170,7 +170,7 @@

// const char** arg_names,

// const unsigned char* arg_types,

// const unsigned long long* arg_values,

-// scoped_ptr<ConvertableToTraceFormat>*

+// std::unique_ptr<ConvertableToTraceFormat>*

// convertable_values,

// unsigned int flags)

#define TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP \

@@ -191,7 +191,7 @@

// const unsigned char* category_group_enabled,

// const char* event_name,

// const char* arg_name,

-// scoped_ptr<ConvertableToTraceFormat> arg_value)

+// std::unique_ptr<ConvertableToTraceFormat> arg_value)

#define TRACE_EVENT_API_ADD_METADATA_EVENT \

trace_event_internal::AddMetadataEvent

@@ -629,10 +629,10 @@ AddTraceEventWithThreadIdAndTimestamp(

unsigned int flags,

unsigned long long bind_id,

const char* arg1_name,

- scoped_ptr<ARG1_CONVERTABLE_TYPE> arg1_val) {

+ std::unique_ptr<ARG1_CONVERTABLE_TYPE> arg1_val) {

const int num_args = 1;

unsigned char arg_types[1] = { TRACE_VALUE_TYPE_CONVERTABLE };

- scoped_ptr<base::trace_event::ConvertableToTraceFormat>

+ std::unique_ptr<base::trace_event::ConvertableToTraceFormat>

convertable_values[1] = {std::move(arg1_val)};

return TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(

phase, category_group_enabled, name, scope, id, bind_id, thread_id,

@@ -655,7 +655,7 @@ AddTraceEventWithThreadIdAndTimestamp(

const char* arg1_name,

const ARG1_TYPE& arg1_val,

const char* arg2_name,

- scoped_ptr<ARG2_CONVERTABLE_TYPE> arg2_val) {

+ std::unique_ptr<ARG2_CONVERTABLE_TYPE> arg2_val) {

const int num_args = 2;

const char* arg_names[2] = { arg1_name, arg2_name };

@@ -663,7 +663,7 @@ AddTraceEventWithThreadIdAndTimestamp(

unsigned long long arg_values[2];

SetTraceValue(arg1_val, &arg_types[0], &arg_values[0]);

arg_types[1] = TRACE_VALUE_TYPE_CONVERTABLE;

- scoped_ptr<base::trace_event::ConvertableToTraceFormat>

+ std::unique_ptr<base::trace_event::ConvertableToTraceFormat>

convertable_values[2] = {nullptr, std::move(arg2_val)};

return TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(

phase, category_group_enabled, name, scope, id, bind_id, thread_id,

@@ -684,7 +684,7 @@ AddTraceEventWithThreadIdAndTimestamp(

unsigned int flags,

unsigned long long bind_id,

const char* arg1_name,

- scoped_ptr<ARG1_CONVERTABLE_TYPE> arg1_val,

+ std::unique_ptr<ARG1_CONVERTABLE_TYPE> arg1_val,

const char* arg2_name,

const ARG2_TYPE& arg2_val) {

const int num_args = 2;

@@ -695,7 +695,7 @@ AddTraceEventWithThreadIdAndTimestamp(

arg_types[0] = TRACE_VALUE_TYPE_CONVERTABLE;

arg_values[0] = 0;

SetTraceValue(arg2_val, &arg_types[1], &arg_values[1]);

- scoped_ptr<base::trace_event::ConvertableToTraceFormat>

+ std::unique_ptr<base::trace_event::ConvertableToTraceFormat>

convertable_values[2] = {std::move(arg1_val), nullptr};

return TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(

phase, category_group_enabled, name, scope, id, bind_id, thread_id,

@@ -716,14 +716,14 @@ AddTraceEventWithThreadIdAndTimestamp(

unsigned int flags,

unsigned long long bind_id,

const char* arg1_name,

- scoped_ptr<ARG1_CONVERTABLE_TYPE> arg1_val,

+ std::unique_ptr<ARG1_CONVERTABLE_TYPE> arg1_val,

const char* arg2_name,

- scoped_ptr<ARG2_CONVERTABLE_TYPE> arg2_val) {

+ std::unique_ptr<ARG2_CONVERTABLE_TYPE> arg2_val) {

const int num_args = 2;

const char* arg_names[2] = { arg1_name, arg2_name };

unsigned char arg_types[2] =

{ TRACE_VALUE_TYPE_CONVERTABLE, TRACE_VALUE_TYPE_CONVERTABLE };

- scoped_ptr<base::trace_event::ConvertableToTraceFormat>

+ std::unique_ptr<base::trace_event::ConvertableToTraceFormat>

convertable_values[2] = {std::move(arg1_val), std::move(arg2_val)};

return TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(

phase, category_group_enabled, name, scope, id, bind_id, thread_id,

@@ -813,7 +813,7 @@ static inline base::trace_event::TraceEventHandle AddTraceEvent(

unsigned int flags,

unsigned long long bind_id,

const char* arg1_name,

- scoped_ptr<ARG1_CONVERTABLE_TYPE> arg1_val) {

+ std::unique_ptr<ARG1_CONVERTABLE_TYPE> arg1_val) {

int thread_id = static_cast<int>(base::PlatformThread::CurrentId());

base::TimeTicks now = base::TimeTicks::Now();

return AddTraceEventWithThreadIdAndTimestamp(

@@ -858,7 +858,7 @@ static inline base::trace_event::TraceEventHandle AddTraceEvent(

unsigned int flags,

unsigned long long bind_id,

const char* arg1_name,

- scoped_ptr<ARG1_CONVERTABLE_TYPE> arg1_val,

+ std::unique_ptr<ARG1_CONVERTABLE_TYPE> arg1_val,

const char* arg2_name,

const ARG2_TYPE& arg2_val) {

int thread_id = static_cast<int>(base::PlatformThread::CurrentId());

@@ -880,7 +880,7 @@ static inline base::trace_event::TraceEventHandle AddTraceEvent(

const char* arg1_name,

const ARG1_TYPE& arg1_val,

const char* arg2_name,

- scoped_ptr<ARG2_CONVERTABLE_TYPE> arg2_val) {

+ std::unique_ptr<ARG2_CONVERTABLE_TYPE> arg2_val) {

int thread_id = static_cast<int>(base::PlatformThread::CurrentId());

base::TimeTicks now = base::TimeTicks::Now();

return AddTraceEventWithThreadIdAndTimestamp(

@@ -898,9 +898,9 @@ static inline base::trace_event::TraceEventHandle AddTraceEvent(

unsigned int flags,

unsigned long long bind_id,

const char* arg1_name,

- scoped_ptr<ARG1_CONVERTABLE_TYPE> arg1_val,

+ std::unique_ptr<ARG1_CONVERTABLE_TYPE> arg1_val,

const char* arg2_name,

- scoped_ptr<ARG2_CONVERTABLE_TYPE> arg2_val) {

+ std::unique_ptr<ARG2_CONVERTABLE_TYPE> arg2_val) {

int thread_id = static_cast<int>(base::PlatformThread::CurrentId());

base::TimeTicks now = base::TimeTicks::Now();

return AddTraceEventWithThreadIdAndTimestamp(

@@ -933,10 +933,10 @@ static inline void AddMetadataEvent(

const unsigned char* category_group_enabled,

const char* event_name,

const char* arg_name,

- scoped_ptr<ARG1_CONVERTABLE_TYPE> arg_value) {

+ std::unique_ptr<ARG1_CONVERTABLE_TYPE> arg_value) {

const char* arg_names[1] = {arg_name};

unsigned char arg_types[1] = {TRACE_VALUE_TYPE_CONVERTABLE};

- scoped_ptr<base::trace_event::ConvertableToTraceFormat>

+ std::unique_ptr<base::trace_event::ConvertableToTraceFormat>

convertable_values[1] = {std::move(arg_value)};

base::trace_event::TraceLog::GetInstance()->AddMetadataEvent(

category_group_enabled, event_name,

« no previous file with comments | « base/trace_event/trace_config_unittest.cc ('k') | base/trace_event/trace_event_android.cc » ('j') | no next file with comments »