Added support for GVR controllers

device/gamepad/gamepad_data_fetcher_manager.cc

 // Copyright 2016 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_data_fetcher_manager.h"
 
 #include "device/gamepad/gamepad_data_fetcher.h"
 #include "device/gamepad/gamepad_platform_data_fetcher.h"
 
 namespace device {
@@ skipping 20 matching lines @@
   factories_.push_back(factory);
   if (provider_) {
     provider_->AddGamepadDataFetcher(factory->CreateDataFetcher());
   }
 }
 
 void GamepadDataFetcherManager::RemoveSourceFactory(GamepadSource source) {
   if (provider_)
     provider_->RemoveSourceGamepadDataFetcher(source);
 
-  for (FactoryVector::iterator it = factories_.begin(); it != factories_.end();
-       ++it) {
+  for (FactoryVector::iterator it = factories_.begin();
+       it != factories_.end();) {
     if ((*it)->source() == source) {
       delete (*it);
-      factories_.erase(it);
+      it = factories_.erase(it);
+    } else {
+      ++it;
     }
   }
 }
 
 void GamepadDataFetcherManager::InitializeProvider(GamepadProvider* provider) {
   DCHECK(!provider_);
 
   provider_ = provider;
   for (const auto& it : factories_) {
     provider_->AddGamepadDataFetcher(it->CreateDataFetcher());
   }
 }
 
 void GamepadDataFetcherManager::ClearProvider() {
   provider_ = nullptr;
 }
 
 }  // namespace device