Remove base::ScopedPtrHashMap from chrome/browser/media_galleries/.

chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stddef.h>
 
 #include <algorithm>
 #include <limits>
+#include <unordered_map>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 373 matching lines @@
   bool DeleteChild(uint32_t file_id);
 
   bool HasChildren() const;
 
   uint32_t file_id() const { return file_id_; }
   const std::string& file_name() const { return file_name_; }
   MTPFileNode* parent() { return parent_; }
 
  private:
   // Container for holding a node's children.
-  typedef base::ScopedPtrHashMap<std::string, std::unique_ptr<MTPFileNode>>
-      ChildNodes;
+  using ChildNodes =
+      std::unordered_map<std::string, std::unique_ptr<MTPFileNode>>;
 
   const uint32_t file_id_;
   const std::string file_name_;
 
   ChildNodes children_;
   MTPFileNode* const parent_;
   FileIdToMTPFileNodeMap* file_id_to_node_map_;
 
   DISALLOW_COPY_AND_ASSIGN(MTPFileNode);
 };
@@ skipping 16 matching lines @@
 MTPDeviceDelegateImplLinux::MTPFileNode::~MTPFileNode() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   size_t erased = file_id_to_node_map_->erase(file_id_);
   DCHECK_EQ(1U, erased);
 }
 
 const MTPDeviceDelegateImplLinux::MTPFileNode*
 MTPDeviceDelegateImplLinux::MTPFileNode::GetChild(
     const std::string& name) const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-  return children_.get(name);
+  auto it = children_.find(name);
+  if (it == children_.end())
+    return nullptr;
+  return it->second.get();
 }
 
 void MTPDeviceDelegateImplLinux::MTPFileNode::EnsureChildExists(
     const std::string& name,
     uint32_t id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   const MTPFileNode* child = GetChild(name);
   if (child && child->file_id() == id)
     return;
 
-  children_.set(name, base::WrapUnique(new MTPFileNode(id, name, this,
-                                                       file_id_to_node_map_)));
+  children_[name] =
+      base::MakeUnique<MTPFileNode>(id, name, this, file_id_to_node_map_);
 }
 
 void MTPDeviceDelegateImplLinux::MTPFileNode::ClearNonexistentChildren(
     const std::set<std::string>& children_to_keep) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-  std::set<std::string> children_to_erase;
-  for (ChildNodes::const_iterator it = children_.begin();
-       it != children_.end(); ++it) {
-    if (base::ContainsKey(children_to_keep, it->first))
+  std::vector<std::string> children_to_erase;
+  for (const auto& child : children_) {
+    if (base::ContainsKey(children_to_keep, child.first))
       continue;
-    children_to_erase.insert(it->first);
+    children_to_erase.push_back(child.first);
   }
-  for (std::set<std::string>::iterator it = children_to_erase.begin();
-       it != children_to_erase.end(); ++it) {
-    children_.take_and_erase(*it);
-  }
+  for (const auto& child : children_to_erase)
+    children_.erase(child);
 }
 
 bool MTPDeviceDelegateImplLinux::MTPFileNode::DeleteChild(uint32_t file_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-  for (ChildNodes::iterator it = children_.begin();
-       it != children_.end(); ++it) {
+  for (auto it = children_.begin(); it != children_.end(); ++it) {
     if (it->second->file_id() == file_id) {
       DCHECK(!it->second->HasChildren());
       children_.erase(it);
       return true;
     }
   }
   return false;
 }
 
 bool MTPDeviceDelegateImplLinux::MTPFileNode::HasChildren() const {
@@ skipping 1402 matching lines @@
   }
 }
 
 void CreateMTPDeviceAsyncDelegate(
     const std::string& device_location,
     const bool read_only,
     const CreateMTPDeviceAsyncDelegateCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   callback.Run(new MTPDeviceDelegateImplLinux(device_location, read_only));
 }