Reland 'Convert //net and //chromecast to std::unordered_*'

chromecast/base/device_capabilities_impl.h

Index: chromecast/base/device_capabilities_impl.h
diff --git a/chromecast/base/device_capabilities_impl.h b/chromecast/base/device_capabilities_impl.h
index 70917a5acb317b0cf611db18b7232cb1b4a2e01d..d463ed0dab6c362f078a008f7f1a63d135419567 100644
--- a/chromecast/base/device_capabilities_impl.h
+++ b/chromecast/base/device_capabilities_impl.h
@@ -5,9 +5,10 @@
 #ifndef CHROMECAST_BASE_DEVICE_CAPABILITIES_IMPL_H_
 #define CHROMECAST_BASE_DEVICE_CAPABILITIES_IMPL_H_
 
+#include <memory>
 #include <string>
+#include <unordered_map>
 
-#include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list_threadsafe.h"
@@ -70,8 +71,8 @@ class DeviceCapabilitiesImpl : public DeviceCapabilities {
 
   // Map from capability key to corresponding ValidatorInfo. Gets updated
   // in Register()/Unregister().
-  typedef base::ScopedPtrHashMap<std::string, std::unique_ptr<ValidatorInfo>>
-      ValidatorMap;
+  using ValidatorMap =
+      std::unordered_map<std::string, std::unique_ptr<ValidatorInfo>>;
 
   // Internal constructor used by static DeviceCapabilities::Create*() methods.
   DeviceCapabilitiesImpl();