commit c20ed13f5c0e87e7a5164d1b5330ccd99cced58f
author Ben Chan <benchan@chromium.org> Thu Oct 16 12:25:03 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat Oct 18 01:38:58 2014 +0000
tree 5348c60fb85375f423adaa386e6e65dac07d56e9
parent d1fce5554f7478e1c9d0fb5fd7f82dcb53d07110

shill: cellular: Replace scoped_ptr with std::unique_ptr.

BUG=None
TEST=`USE='cellular' FEATURES=test emerge-$BOARD shill`

Change-Id: I56a7437eab6ed87d8289c61f88bed09aca54f04b
Reviewed-on: https://chromium-review.googlesource.com/223737
Reviewed-by: Thieu Le <thieule@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>

pending_activation_store.h

diff --git a/pending_activation_store.h b/pending_activation_store.h
index de2828d..dd58ec9 100644
--- a/pending_activation_store.h
+++ b/pending_activation_store.h
@@ -5,10 +5,10 @@
 #ifndef SHILL_PENDING_ACTIVATION_STORE_H_
 #define SHILL_PENDING_ACTIVATION_STORE_H_
 
+#include <memory>
 #include <string>
 
 #include <base/files/file_path.h>
-#include <base/memory/scoped_ptr.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
 #include "shill/key_file_store.h"
@@ -93,7 +93,7 @@
 
   static std::string IdentifierTypeToGroupId(IdentifierType type);
 
-  scoped_ptr<StoreInterface> storage_;
+  std::unique_ptr<StoreInterface> storage_;
 
   DISALLOW_COPY_AND_ASSIGN(PendingActivationStore);
 };