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

Unified Diff: remoting/host/host_config.h

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU 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 | « remoting/host/host_change_notification_listener_unittest.cc ('k') | remoting/host/host_config.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/host_config.h
diff --git a/remoting/host/host_config.h b/remoting/host/host_config.h
index 0ce69f2d686bebe612600c74678f70b63b9acc4b..73f0408a8251eb55b235729180b8cf4adc7f7020 100644
--- a/remoting/host/host_config.h
+++ b/remoting/host/host_config.h
@@ -5,9 +5,9 @@
#ifndef REMOTING_HOST_HOST_CONFIG_H_
#define REMOTING_HOST_HOST_CONFIG_H_
+#include <memory>
#include <string>
-#include "base/memory/scoped_ptr.h"
namespace base {
class DictionaryValue;
@@ -47,12 +47,12 @@ extern const char kFrameRecorderBufferKbConfigPath[];
extern const char kGcdDeviceIdConfigPath[];
// Helpers for serializing/deserializing Host configuration dictonaries.
-scoped_ptr<base::DictionaryValue> HostConfigFromJson(
+std::unique_ptr<base::DictionaryValue> HostConfigFromJson(
const std::string& serialized);
std::string HostConfigToJson(const base::DictionaryValue& host_config);
// Helpers for loading/saving host configurations from/to files.
-scoped_ptr<base::DictionaryValue> HostConfigFromJsonFile(
+std::unique_ptr<base::DictionaryValue> HostConfigFromJsonFile(
const base::FilePath& config_file);
bool HostConfigToJsonFile(const base::DictionaryValue& host_config,
const base::FilePath& config_file);
« no previous file with comments | « remoting/host/host_change_notification_listener_unittest.cc ('k') | remoting/host/host_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698