Revert of Fix crash in SimpleGeolocationProvider.

chromeos/geolocation/simple_geolocation_provider.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 "chromeos/geolocation/simple_geolocation_provider.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
@@ skipping 44 matching lines @@
 void SimpleGeolocationProvider::OnGeolocationResponse(
     SimpleGeolocationRequest* request,
     SimpleGeolocationRequest::ResponseCallback callback,
     const Geoposition& geoposition,
     bool server_error,
     const base::TimeDelta elapsed) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   callback.Run(geoposition, server_error, elapsed);
 
-  ScopedVector<SimpleGeolocationRequest>::iterator position =
-      std::find(requests_.begin(), requests_.end(), request);
-  DCHECK_NE(&(*position), &(*requests_.end()));
-  if (position != requests_.end()) {
-    std::swap(*position, *requests_.rbegin());
-    requests_.resize(requests_.size() - 1);
-  }
+  ScopedVector<SimpleGeolocationRequest>::iterator new_end =
+      std::remove(requests_.begin(), requests_.end(), request);
+  DCHECK_EQ(std::distance(new_end, requests_.end()), 1);
+  requests_.erase(new_end, requests_.end());
 }
 
 }  // namespace chromeos