Index: content/browser/tracing/background_tracing_manager_impl.h |
diff --git a/content/browser/tracing/background_tracing_manager_impl.h b/content/browser/tracing/background_tracing_manager_impl.h |
index f1d88f26b2b6e3258cfce7e8af09e78b8faade62..bcb25a4214e6321769af273756a02eb4ed5f6efa 100644 |
--- a/content/browser/tracing/background_tracing_manager_impl.h |
+++ b/content/browser/tracing/background_tracing_manager_impl.h |
@@ -5,10 +5,11 @@ |
#ifndef CONTENT_BROWSER_TRACING_BACKGROUND_TRACING_MANAGER_IMPL_H_ |
#define CONTENT_BROWSER_TRACING_BACKGROUND_TRACING_MANAGER_IMPL_H_ |
+#include <memory> |
+ |
#include "base/lazy_instance.h" |
#include "base/macros.h" |
#include "base/memory/ref_counted_memory.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/metrics/histogram.h" |
#include "content/browser/tracing/background_tracing_config_impl.h" |
@@ -25,7 +26,7 @@ class BackgroundTracingManagerImpl : public BackgroundTracingManager { |
public: |
static CONTENT_EXPORT BackgroundTracingManagerImpl* GetInstance(); |
- bool SetActiveScenario(scoped_ptr<BackgroundTracingConfig>, |
+ bool SetActiveScenario(std::unique_ptr<BackgroundTracingConfig>, |
const ReceiveCallback&, |
DataFiltering data_filtering) override; |
void WhenIdle(IdleCallback idle_callback) override; |
@@ -55,9 +56,8 @@ class BackgroundTracingManagerImpl : public BackgroundTracingManager { |
void StartTracing(std::string, base::trace_event::TraceRecordMode); |
void StartTracingIfConfigNeedsIt(); |
- void OnFinalizeStarted( |
- scoped_ptr<const base::DictionaryValue> metadata, |
- base::RefCountedString*); |
+ void OnFinalizeStarted(std::unique_ptr<const base::DictionaryValue> metadata, |
+ base::RefCountedString*); |
void OnFinalizeComplete(); |
void BeginFinalizing(StartedFinalizingCallback); |
void ValidateStartupScenario(); |
@@ -90,10 +90,10 @@ class BackgroundTracingManagerImpl : public BackgroundTracingManager { |
StartedFinalizingCallback callback_; |
}; |
- scoped_ptr<TracingDelegate> delegate_; |
- scoped_ptr<const content::BackgroundTracingConfigImpl> config_; |
+ std::unique_ptr<TracingDelegate> delegate_; |
+ std::unique_ptr<const content::BackgroundTracingConfigImpl> config_; |
std::map<TriggerHandle, std::string> trigger_handles_; |
- scoped_ptr<TracingTimer> tracing_timer_; |
+ std::unique_ptr<TracingTimer> tracing_timer_; |
ReceiveCallback receive_callback_; |
bool is_gathering_; |