Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Unified Diff: content/browser/tracing/tracing_ui.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « content/browser/tracing/tracing_ui.h ('k') | content/browser/utility_process_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tracing/tracing_ui.cc
diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc
index 074a771a1a88d0889c5021f9cc8df7213ff8ed73..04452c4a02a58301461181b88749e28027c81566 100644
--- a/content/browser/tracing/tracing_ui.cc
+++ b/content/browser/tracing/tracing_ui.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <memory>
#include <set>
#include <string>
#include <vector>
@@ -17,7 +18,6 @@
#include "base/format_macros.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -62,7 +62,7 @@ bool GetTracingOptions(const std::string& data64,
return false;
}
- scoped_ptr<base::Value> optionsRaw = base::JSONReader::Read(data);
+ std::unique_ptr<base::Value> optionsRaw = base::JSONReader::Read(data);
if (!optionsRaw) {
LOG(ERROR) << "Options were not valid JSON";
return false;
@@ -147,7 +147,7 @@ void OnTraceBufferStatusResult(const WebUIDataSource::GotDataCallback& callback,
void TracingCallbackWrapperBase64(
const WebUIDataSource::GotDataCallback& callback,
- scoped_ptr<const base::DictionaryValue> metadata,
+ std::unique_ptr<const base::DictionaryValue> metadata,
base::RefCountedString* data) {
base::RefCountedString* data_base64 = new base::RefCountedString();
base::Base64Encode(data->data(), &data_base64->data());
« no previous file with comments | « content/browser/tracing/tracing_ui.h ('k') | content/browser/utility_process_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698