Revert of Fix crash in SimpleGeolocationProvider.

chromeos/timezone/timezone_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/timezone/timezone_provider.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
@@ skipping 29 matching lines @@
                  request,
                  callback));
   request->MakeRequest(callback_tmp);
 }
 
 void TimeZoneProvider::OnTimezoneResponse(
     TimeZoneRequest* request,
     TimeZoneRequest::TimeZoneResponseCallback callback,
     scoped_ptr<TimeZoneResponseData> timezone,
     bool server_error) {
-  ScopedVector<TimeZoneRequest>::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<TimeZoneRequest>::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());
 
   callback.Run(timezone.Pass(), server_error);
 }
 
 }  // namespace chromeos