2 files changed, 5 insertions, 10 deletions
diff --git a/components/pairing/bluetooth_controller_pairing_controller.cc b/components/pairing/bluetooth_controller_pairing_controller.cc
index 4c4d855..bf5e7fd 100644
--- a/components/pairing/bluetooth_controller_pairing_controller.cc
+++ b/components/pairing/bluetooth_controller_pairing_controller.cc
@@ -137,11 +137,8 @@ void BluetoothControllerPairingController::OnStartDiscoverySession(
   discovery_session_ = discovery_session.Pass();
   ChangeStage(STAGE_DEVICES_DISCOVERY);
 
-  device::BluetoothAdapter::DeviceList device_list = adapter_->GetDevices();
-  for (device::BluetoothAdapter::DeviceList::iterator ix = device_list.begin();
-       ix != device_list.end(); ++ix) {
-    DeviceFound(*ix);
-  }
+  for (const auto& device : adapter_->GetDevices())
+    DeviceFound(device);
 }
 
 void BluetoothControllerPairingController::OnConnect() {
diff --git a/components/pairing/fake_controller_pairing_controller.cc b/components/pairing/fake_controller_pairing_controller.cc
index 0b05ee6..6528061 100644
--- a/components/pairing/fake_controller_pairing_controller.cc
+++ b/components/pairing/fake_controller_pairing_controller.cc
@@ -82,11 +82,9 @@ void FakeControllerPairingController::ApplyConfig(const std::string& config) {
       base::SplitStringIntoKeyValuePairs(dict["discovery"], '-', '~', &events))
       << "Wrong 'discovery' format.";
   DiscoveryScenario scenario;
-  for (base::StringPairs::const_iterator event = events.begin();
-       event != events.end();
-       ++event) {
-    std::string type = event->first;
-    std::string device_id = event->second;
+  for (const auto& event : events) {
+    const std::string& type = event.first;
+    const std::string& device_id = event.second;
     CHECK(type == "F" || type == "L" || type == "N")
         << "Wrong discovery event type.";
     CHECK(!device_id.empty() || type == "N") << "Empty device ID.";