| Index: content/renderer/devtools/v8_sampling_profiler.cc
|
| diff --git a/content/renderer/devtools/v8_sampling_profiler.cc b/content/renderer/devtools/v8_sampling_profiler.cc
|
| index 4ad7ffaf654241e9ea1b1e610838e96f4ce0e5cd..50c268d6240c4f24ae7a515a2af8832852a46d76 100644
|
| --- a/content/renderer/devtools/v8_sampling_profiler.cc
|
| +++ b/content/renderer/devtools/v8_sampling_profiler.cc
|
| @@ -106,7 +106,7 @@ class SampleRecord {
|
| void Collect(v8::Isolate* isolate,
|
| base::TimeTicks timestamp,
|
| const v8::RegisterState& state);
|
| - scoped_ptr<ConvertableToTraceFormat> ToTraceFormat() const;
|
| + std::unique_ptr<ConvertableToTraceFormat> ToTraceFormat() const;
|
|
|
| private:
|
| base::TimeTicks timestamp_;
|
| @@ -128,8 +128,8 @@ void SampleRecord::Collect(v8::Isolate* isolate,
|
| vm_state_ = sample_info.vm_state;
|
| }
|
|
|
| -scoped_ptr<ConvertableToTraceFormat> SampleRecord::ToTraceFormat() const {
|
| - scoped_ptr<base::trace_event::TracedValue> data(
|
| +std::unique_ptr<ConvertableToTraceFormat> SampleRecord::ToTraceFormat() const {
|
| + std::unique_ptr<base::trace_event::TracedValue> data(
|
| new base::trace_event::TracedValue());
|
| const char* vm_state = nullptr;
|
| switch (vm_state_) {
|
| @@ -170,7 +170,7 @@ class Sampler {
|
| public:
|
| ~Sampler();
|
|
|
| - static scoped_ptr<Sampler> CreateForCurrentThread();
|
| + static std::unique_ptr<Sampler> CreateForCurrentThread();
|
| static Sampler* GetInstance() { return tls_instance_.Pointer()->Get(); }
|
|
|
| // These methods are called from the sampling thread.
|
| @@ -197,7 +197,7 @@ class Sampler {
|
|
|
| static void InstallJitCodeEventHandler(Isolate* isolate, void* data);
|
| static void HandleJitCodeEvent(const v8::JitCodeEvent* event);
|
| - static scoped_ptr<ConvertableToTraceFormat> JitCodeEventToTraceFormat(
|
| + static std::unique_ptr<ConvertableToTraceFormat> JitCodeEventToTraceFormat(
|
| const v8::JitCodeEvent* event);
|
|
|
| void InjectPendingEvents();
|
| @@ -207,7 +207,7 @@ class Sampler {
|
|
|
| PlatformData platform_data_;
|
| Isolate* isolate_;
|
| - scoped_ptr<SamplingQueue> samples_data_;
|
| + std::unique_ptr<SamplingQueue> samples_data_;
|
| base::subtle::Atomic32 code_added_events_count_;
|
| base::subtle::Atomic32 samples_count_;
|
| int code_added_events_to_collect_for_test_;
|
| @@ -237,8 +237,8 @@ Sampler::~Sampler() {
|
| }
|
|
|
| // static
|
| -scoped_ptr<Sampler> Sampler::CreateForCurrentThread() {
|
| - return scoped_ptr<Sampler>(new Sampler());
|
| +std::unique_ptr<Sampler> Sampler::CreateForCurrentThread() {
|
| + return std::unique_ptr<Sampler>(new Sampler());
|
| }
|
|
|
| void Sampler::Start() {
|
| @@ -360,11 +360,11 @@ void Sampler::HandleJitCodeEvent(const v8::JitCodeEvent* event) {
|
| }
|
|
|
| // static
|
| -scoped_ptr<ConvertableToTraceFormat> Sampler::JitCodeEventToTraceFormat(
|
| +std::unique_ptr<ConvertableToTraceFormat> Sampler::JitCodeEventToTraceFormat(
|
| const v8::JitCodeEvent* event) {
|
| switch (event->type) {
|
| case v8::JitCodeEvent::CODE_ADDED: {
|
| - scoped_ptr<base::trace_event::TracedValue> data(
|
| + std::unique_ptr<base::trace_event::TracedValue> data(
|
| new base::trace_event::TracedValue());
|
| data->SetString("code_start", PtrToString(event->code_start));
|
| data->SetInteger("code_len", static_cast<unsigned>(event->code_len));
|
| @@ -376,7 +376,7 @@ scoped_ptr<ConvertableToTraceFormat> Sampler::JitCodeEventToTraceFormat(
|
| }
|
|
|
| case v8::JitCodeEvent::CODE_MOVED: {
|
| - scoped_ptr<base::trace_event::TracedValue> data(
|
| + std::unique_ptr<base::trace_event::TracedValue> data(
|
| new base::trace_event::TracedValue());
|
| data->SetString("code_start", PtrToString(event->code_start));
|
| data->SetInteger("code_len", static_cast<unsigned>(event->code_len));
|
| @@ -385,7 +385,7 @@ scoped_ptr<ConvertableToTraceFormat> Sampler::JitCodeEventToTraceFormat(
|
| }
|
|
|
| case v8::JitCodeEvent::CODE_REMOVED: {
|
| - scoped_ptr<base::trace_event::TracedValue> data(
|
| + std::unique_ptr<base::trace_event::TracedValue> data(
|
| new base::trace_event::TracedValue());
|
| data->SetString("code_start", PtrToString(event->code_start));
|
| data->SetInteger("code_len", static_cast<unsigned>(event->code_len));
|
|
|