Convert a couple loops to range based iterators.

components/pairing/fake_controller_pairing_controller.cc

 // Copyright 2014 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 "components/pairing/fake_controller_pairing_controller.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 64 matching lines @@
 
   if (!dict.count("discovery")) {
     dict["discovery"] =
         "F-Device_1~F-Device_5~F-Device_3~L-Device_3~L-Device_1~F-Device_1";
   }
   base::StringPairs events;
   CHECK(
       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) {
+    std::string type = event.first;

[achuithb, 2014/10/02 21:09:54]

let's avoid the copy and make these const std::string&

[Zachary Kuznia, 2014/10/02 21:25:16]

Done.

+    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.";
     scenario.push_back(DiscoveryEvent(
         type == "F" ? DEVICE_FOUND : type == "L" ? DEVICE_LOST : NOTHING_FOUND,
         device_id));
   }
   SetDiscoveryScenario(scenario);
 
   preset_confirmation_code_ = dict["code"];
@@ skipping 234 matching lines @@
     next_stage = STAGE_HOST_CONNECTION_LOST;
   }
   if (next_stage != STAGE_NONE)
     ChangeStageLater(next_stage);
 }
 
 void FakeControllerPairingController::DiscoveredDevicesListChanged() {
 }
 
 }  // namespace pairing_chromeos