summaryrefslogtreecommitdiff
path: root/profile.h
diff options
context:
space:
mode:
authorBen Chan <benchan@chromium.org>2014-10-17 00:39:48 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-10-18 01:37:51 +0000
commitd419b6dc297755e8f0546b2f780851b49aab1fc7 (patch)
tree71acdba9da8b27ea9fdbe8ebe9b197de8c24a55b /profile.h
parentef76af866aa73abb8c16958844cb13f042881bcb (diff)
downloadshill-d419b6dc297755e8f0546b2f780851b49aab1fc7.tar.gz
shill: profile: Replace scoped_ptr with std::unique_ptr.
BUG=None TEST=`FEATURES=test emerge-$BOARD shill` Change-Id: I6fa5ec6fb2dbb6c0f4aa39a1d62ed2070697d89f Reviewed-on: https://chromium-review.googlesource.com/224158 Reviewed-by: Paul Stewart <pstew@chromium.org> Commit-Queue: Ben Chan <benchan@chromium.org> Tested-by: Ben Chan <benchan@chromium.org>
Diffstat (limited to 'profile.h')
-rw-r--r--profile.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/profile.h b/profile.h
index 26b6b19f..bc403c1c 100644
--- a/profile.h
+++ b/profile.h
@@ -6,10 +6,10 @@
#define SHILL_PROFILE_H_
#include <map>
+#include <memory>
#include <string>
#include <vector>
-#include <base/memory/scoped_ptr.h>
#include <base/files/file_path.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
@@ -234,9 +234,9 @@ class Profile : public base::RefCounted<Profile> {
const base::FilePath storage_path_;
// Allows this profile to be backed with on-disk storage.
- scoped_ptr<StoreInterface> storage_;
+ std::unique_ptr<StoreInterface> storage_;
- scoped_ptr<ProfileAdaptorInterface> adaptor_;
+ std::unique_ptr<ProfileAdaptorInterface> adaptor_;
DISALLOW_COPY_AND_ASSIGN(Profile);
};