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

chromecast/base/device_capabilities_impl.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "base/synchronization/lock.h"
 #include "chromecast/base/device_capabilities.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
@@ skipping 42 matching lines @@
     DISALLOW_COPY_AND_ASSIGN(ValidatorInfo);
   };
 
   // For DeviceCapabilitiesImpl()
   friend class DeviceCapabilities;
   // For SetValidatedValueInternal()
   friend class DeviceCapabilities::Validator;
 
   // 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();
 
   void SetValidatedValue(const std::string& path,
                          std::unique_ptr<base::Value> new_value) override;
 
   // Lock for reading/writing data_ pointer
   mutable base::Lock data_lock_;
   // Lock for reading/writing validator_map_
   mutable base::Lock validation_lock_;
 
   scoped_refptr<Data> data_;
   // TaskRunner for capability writes. All internal writes to data_ must occur
   // on task_runner_for_writes_'s thread.
   const scoped_refptr<base::SingleThreadTaskRunner> task_runner_for_writes_;
 
   ValidatorMap validator_map_;
   const scoped_refptr<base::ObserverListThreadSafe<Observer>> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceCapabilitiesImpl);
 };
 
 }  // namespace chromecast
 
 #endif  // CHROMECAST_BASE_DEVICE_CAPABILITIES_IMPL_H_