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

Unified Diff: components/cloud_devices/common/cloud_device_description.h

Issue 1921973002: Convert //components/[a-e]* 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
Index: components/cloud_devices/common/cloud_device_description.h
diff --git a/components/cloud_devices/common/cloud_device_description.h b/components/cloud_devices/common/cloud_device_description.h
index c415ad5167f7ee444d7b76fa41779dc558a2636c..eb6e20751ef2728c42d8615bf92034b0d6b256c4 100644
--- a/components/cloud_devices/common/cloud_device_description.h
+++ b/components/cloud_devices/common/cloud_device_description.h
@@ -5,11 +5,11 @@
#ifndef COMPONENTS_CLOUD_DEVICES_COMMON_CLOUD_DEVICE_DESCRIPTION_H_
#define COMPONENTS_CLOUD_DEVICES_COMMON_CLOUD_DEVICE_DESCRIPTION_H_
+#include <memory>
#include <string>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
namespace base {
class DictionaryValue;
@@ -28,7 +28,7 @@ class CloudDeviceDescription {
void Reset();
- bool InitFromDictionary(scoped_ptr<base::DictionaryValue> root);
+ bool InitFromDictionary(std::unique_ptr<base::DictionaryValue> root);
bool InitFromString(const std::string& json);
std::string ToString() const;
@@ -52,7 +52,7 @@ class CloudDeviceDescription {
base::ListValue* CreateListItem(const std::string& path);
private:
- scoped_ptr<base::DictionaryValue> root_;
+ std::unique_ptr<base::DictionaryValue> root_;
DISALLOW_COPY_AND_ASSIGN(CloudDeviceDescription);
};
« no previous file with comments | « components/client_update_protocol/ecdsa_unittest.cc ('k') | components/cloud_devices/common/cloud_device_description.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698