Added support for GVR controllers

device/gamepad/gamepad_provider.cc

 // Copyright (c) 2012 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 "device/gamepad/gamepad_provider.h"
 
 #include <stddef.h>
 #include <string.h>
 #include <cmath>
 #include <utility>
@@ skipping 169 matching lines @@
     return;
 
   InitializeDataFetcher(fetcher.get());
   data_fetchers_.push_back(std::move(fetcher));
 }
 
 void GamepadProvider::DoRemoveSourceGamepadDataFetcher(GamepadSource source) {
   DCHECK(polling_thread_->task_runner()->BelongsToCurrentThread());
 
   for (GamepadFetcherVector::iterator it = data_fetchers_.begin();
-       it != data_fetchers_.end(); ++it) {
+       it != data_fetchers_.end();) {
     if ((*it)->source() == source) {
-      data_fetchers_.erase(it);
+      it = data_fetchers_.erase(it);
+    } else {
+      ++it;
     }
   }
 }
 
 void GamepadProvider::SendPauseHint(bool paused) {
   DCHECK(polling_thread_->task_runner()->BelongsToCurrentThread());
   for (const auto& it : data_fetchers_) {
     it->PauseHint(paused);
   }
 }
@@ skipping 106 matching lines @@
     ever_had_user_gesture_ = true;
     for (size_t i = 0; i < user_gesture_observers_.size(); i++) {
       user_gesture_observers_[i].task_runner->PostTask(
           FROM_HERE, user_gesture_observers_[i].closure);
     }
     user_gesture_observers_.clear();
   }
 }
 
 }  // namespace device