ScopedPtrMap -> std::map from apps, ash, media, ui

ash/system/chromeos/power/tray_power_unittest.cc

 // Copyright 2013 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 "ash/system/chromeos/power/tray_power.h"
 
 #include <map>
 #include <string>
 
 #include "ash/ash_switches.h"
 #include "ash/test/ash_test_base.h"
-#include "base/containers/scoped_ptr_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
 #include "ui/message_center/fake_message_center.h"
 
 using message_center::Notification;
 using power_manager::PowerSupplyProperties;
 
 namespace {
 
 class MockMessageCenter : public message_center::FakeMessageCenter {
  public:
   MockMessageCenter() : add_count_(0), remove_count_(0) {}
   ~MockMessageCenter() override {}
 
   int add_count() const { return add_count_; }
   int remove_count() const { return remove_count_; }
 
   // message_center::FakeMessageCenter overrides:
   void AddNotification(scoped_ptr<Notification> notification) override {
     add_count_++;
-    notifications_.insert(notification->id(), notification.Pass());
+    notifications_.insert(
+        std::make_pair(notification->id(), std::move(notification)));
   }
   void RemoveNotification(const std::string& id, bool by_user) override {
     Notification* notification = FindVisibleNotificationById(id);
     if (notification && notification->delegate())
       notification->delegate()->Close(by_user);
     remove_count_++;
     notifications_.erase(id);
   }
 
   Notification* FindVisibleNotificationById(const std::string& id) override {
     auto it = notifications_.find(id);
-    return it == notifications_.end() ? NULL : it->second;
+    return it == notifications_.end() ? NULL : it->second.get();
   }
 
  private:
   int add_count_;
   int remove_count_;
-  base::ScopedPtrMap<std::string, scoped_ptr<Notification>> notifications_;
+  std::map<std::string, scoped_ptr<Notification>> notifications_;
 
   DISALLOW_COPY_AND_ASSIGN(MockMessageCenter);
 };
 
 }  // namespace
 
 namespace ash {
 
 class TrayPowerTest : public test::AshTestBase {
  public:
@@ skipping 248 matching lines @@
       power_manager::PowerSupplyProperties_ExternalPower_USB);
   safe_usb.set_battery_percent(TrayPower::kNoWarningPercentage - 0.1);
   {
     SCOPED_TRACE("Notification removed for rounded percent above threshold");
     UpdateNotificationState(safe_usb, TrayPower::NOTIFICATION_NONE, false,
                             true);
   }
 }
 
 }  // namespace ash