Remove stl_util's STLDeleteContainerPairSecondPointers.

chrome/browser/command_updater.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/command_updater.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/observer_list.h"
-#include "base/stl_util.h"
 #include "chrome/browser/command_observer.h"
 #include "chrome/browser/command_updater_delegate.h"
 
 class CommandUpdater::Command {
  public:
   bool enabled;
   base::ObserverList<CommandObserver> observers;
 
   Command() : enabled(true) {}
 };
 
 CommandUpdater::CommandUpdater(CommandUpdaterDelegate* delegate)
     : delegate_(delegate) {
 }
 
 CommandUpdater::~CommandUpdater() {
-  base::STLDeleteContainerPairSecondPointers(commands_.begin(),
-                                             commands_.end());
 }
 
 bool CommandUpdater::SupportsCommand(int id) const {
   return commands_.find(id) != commands_.end();
 }
 
 bool CommandUpdater::IsCommandEnabled(int id) const {
-  const CommandMap::const_iterator command(commands_.find(id));
+  auto command = commands_.find(id);
   if (command == commands_.end())
     return false;
   return command->second->enabled;
 }
 
 bool CommandUpdater::ExecuteCommand(int id) {
   return ExecuteCommandWithDisposition(id, WindowOpenDisposition::CURRENT_TAB);
 }
 
 bool CommandUpdater::ExecuteCommandWithDisposition(
     int id,
     WindowOpenDisposition disposition) {
   if (SupportsCommand(id) && IsCommandEnabled(id)) {
     delegate_->ExecuteCommandWithDisposition(id, disposition);
     return true;
   }
   return false;
 }
 
 void CommandUpdater::AddCommandObserver(int id, CommandObserver* observer) {
   GetCommand(id, true)->observers.AddObserver(observer);
 }
 
 void CommandUpdater::RemoveCommandObserver(int id, CommandObserver* observer) {
   GetCommand(id, false)->observers.RemoveObserver(observer);
 }
 
 void CommandUpdater::RemoveCommandObserver(CommandObserver* observer) {
-  for (CommandMap::const_iterator it = commands_.begin();
-       it != commands_.end();
-       ++it) {
-    Command* command = it->second;
+  for (auto it = commands_.begin(); it != commands_.end(); ++it) {

[Nico, 2016/09/22 15:56:11]

can't this be a for ( ... : commands_) style loop?

[Avi (use Gerrit), 2016/09/22 19:17:17]

Done.

+    Command* command = it->second.get();
     if (command)
       command->observers.RemoveObserver(observer);
   }
 }
 
 void CommandUpdater::UpdateCommandEnabled(int id, bool enabled) {
   Command* command = GetCommand(id, true);
   if (command->enabled == enabled)
     return;  // Nothing to do.
   command->enabled = enabled;
   FOR_EACH_OBSERVER(CommandObserver, command->observers,
                     EnabledStateChangedForCommand(id, enabled));
 }
 
 CommandUpdater::Command* CommandUpdater::GetCommand(int id, bool create) {
   bool supported = SupportsCommand(id);
   if (supported)
-    return commands_[id];
+    return commands_[id].get();
   DCHECK(create);
-  Command* command = new Command;
-  commands_[id] = command;
-  return command;
+  commands_[id] = base::MakeUnique<Command>();
+  return commands_[id].get();

[Nico, 2016/09/22 15:56:11]

also walks twice

[Avi (use Gerrit), 2016/09/22 19:17:16]

Done.

 }