Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Unified Diff: chromeos/network/network_sms_handler.cc

Issue 2283103003: Replace deprecated ScopedVector<T> in chromeos::NetworkSmsHandler (Closed)
Patch Set: rebased to ToT Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/network/network_sms_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_sms_handler.cc
diff --git a/chromeos/network/network_sms_handler.cc b/chromeos/network/network_sms_handler.cc
index 88bd7b1037915b89addc12d0eb81cc77ba884cce..943d57040bf7346a42246585a82073116be52c29 100644
--- a/chromeos/network/network_sms_handler.cc
+++ b/chromeos/network/network_sms_handler.cc
@@ -13,6 +13,7 @@
#include "base/bind.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/gsm_sms_client.h"
@@ -353,16 +354,12 @@ void NetworkSmsHandler::Init() {
void NetworkSmsHandler::RequestUpdate(bool request_existing) {
// If we already received messages and |request_existing| is true, send
// updates for existing messages.
- for (ScopedVector<base::DictionaryValue>::iterator iter =
- received_messages_.begin();
- iter != received_messages_.end(); ++iter) {
- base::DictionaryValue* message = *iter;
+ for (const auto& message : received_messages_) {
NotifyMessageReceived(*message);
}
// Request updates from each device.
- for (ScopedVector<NetworkSmsDeviceHandler>::iterator iter =
- device_handlers_.begin(); iter != device_handlers_.end(); ++iter) {
- (*iter)->RequestUpdate();
+ for (auto& handler : device_handlers_) {
+ handler->RequestUpdate();
}
}
@@ -388,10 +385,9 @@ void NetworkSmsHandler::OnPropertyChanged(const std::string& name,
void NetworkSmsHandler::AddReceivedMessage(
const base::DictionaryValue& message) {
- base::DictionaryValue* new_message = message.DeepCopy();
if (received_messages_.size() >= kMaxReceivedMessages)
received_messages_.erase(received_messages_.begin());
- received_messages_.push_back(new_message);
+ received_messages_.push_back(message.CreateDeepCopy());
}
void NetworkSmsHandler::NotifyMessageReceived(
@@ -474,11 +470,11 @@ void NetworkSmsHandler::DevicePropertiesCallback(
dbus::ObjectPath object_path(object_path_string);
if (service_name == modemmanager::kModemManager1ServiceName) {
device_handlers_.push_back(
- new ModemManager1NetworkSmsDeviceHandler(
+ base::MakeUnique<ModemManager1NetworkSmsDeviceHandler>(
this, service_name, object_path));
} else {
device_handlers_.push_back(
- new ModemManagerNetworkSmsDeviceHandler(
+ base::MakeUnique<ModemManagerNetworkSmsDeviceHandler>(
this, service_name, object_path));
}
}
« no previous file with comments | « chromeos/network/network_sms_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698