| Index: chromeos/network/managed_network_configuration_handler_impl.h
|
| diff --git a/chromeos/network/managed_network_configuration_handler_impl.h b/chromeos/network/managed_network_configuration_handler_impl.h
|
| index 23a8f724a8b08bc7bf8c04b17c0536af728c131a..9cf30ef7525674bd09ec91063dbde633ae6424a9 100644
|
| --- a/chromeos/network/managed_network_configuration_handler_impl.h
|
| +++ b/chromeos/network/managed_network_configuration_handler_impl.h
|
| @@ -11,7 +11,7 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| -#include "base/memory/linked_ptr.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "chromeos/chromeos_export.h"
|
| #include "chromeos/network/managed_network_configuration_handler.h"
|
| @@ -118,8 +118,8 @@ class CHROMEOS_EXPORT ManagedNetworkConfigurationHandlerImpl
|
| typedef base::Callback<void(const std::string& service_path,
|
| scoped_ptr<base::DictionaryValue> properties)>
|
| GetDevicePropertiesCallback;
|
| - typedef std::map<std::string, linked_ptr<Policies> > UserToPoliciesMap;
|
| - typedef std::map<std::string, linked_ptr<PolicyApplicator>>
|
| + typedef std::map<std::string, scoped_ptr<Policies>> UserToPoliciesMap;
|
| + typedef std::map<std::string, scoped_ptr<PolicyApplicator>>
|
| UserToPolicyApplicatorMap;
|
| typedef std::map<std::string, std::set<std::string>>
|
| UserToModifiedPoliciesMap;
|
|
|