Revert "Allow Chrome on Mac to recognize multiple MFi gamepads"

This reverts commit f3f5e27d.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 509533 as the
culprit for failures in the build cycles as shown on:
https://findit-for-me.appspot.com/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtL2YzZjVlMjdkYjE2YmU1NWNhZjY0MmIyMjc0ZjhjZmU2ZWIzOGU0ZjQM

Sample Failed Build: https://ci.chromium.org/buildbot/chromium.webkit/WebKit%20Mac%20Builder%20%28dbg%29/218396

Original change's description:
> Allow Chrome on Mac to recognize multiple MFi gamepads
> 
> Chrome for Mac recognizes "Made for iOS" (MFi) gamepads enumerated
> by the GameController framework. When multiple such devices are
> connected at once, Chrome fails to properly distinguish them.
> 
> GCController exposes a playerIndex field that defaults to the value
> GCControllerPlayerIndexUnset (-1). The application may set this field
> to a value between 0 and 3 to signal which LEDs should be lit on the
> gamepad. Chrome also uses this field to distinguish gamepads, but does
> not set the index to a unique value. This causes the first-connected
> gamepad to shadow any other connected gamepads.
> 
> This CL ensures each connected MFi gamepad is assigned a unique player
> index up to the OS-defined limit of four.
> 
> BUG=775270
> 
> Change-Id: Ieb852cadc5ff36f94aa1003de3f2e13538114661
> Reviewed-on: https://chromium-review.googlesource.com/723852
> Reviewed-by: Brandon Jones <bajones@chromium.org>
> Commit-Queue: Matt Reynolds <mattreynolds@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#509533}

No-Presubmit: true
No-Tree-Checks: true
No-Try: true
BUG=775270

Change-Id: Ie8a0af7a186753a385d138080ddb70815d992ae5
Reviewed-on: https://chromium-review.googlesource.com/724165
Cr-Commit-Position: refs/heads/master@{#509546}

device/gamepad/game_controller_data_fetcher_mac.h

@@ -30,11 +30,7 @@ class GameControllerDataFetcherMac : public GamepadDataFetcher {
   void GetGamepadData(bool devices_changed_hint) override;
 
  private:
-  int NextUnusedPlayerIndex();
-
   DISALLOW_COPY_AND_ASSIGN(GameControllerDataFetcherMac);
-
-  bool connected_[Gamepads::kItemsLengthCap];
 };
 
 }  // namespace device

device/gamepad/game_controller_data_fetcher_mac.mm

@@ -18,8 +18,6 @@ namespace device {
 
 namespace {
 
-const int kGCControllerPlayerIndexCount = 4;
-
 void CopyNSStringAsUTF16LittleEndian(NSString* src,
                                      UChar* dest,
                                      size_t dest_len) {
@@ -41,41 +39,15 @@ GamepadSource GameControllerDataFetcherMac::source() {
 void GameControllerDataFetcherMac::GetGamepadData(bool) {
   NSArray* controllers = [GCController controllers];
 
-  // In the first pass, record which player indices are still in use so unused
-  // indices can be assigned to newly connected gamepads.
-  bool player_indices[Gamepads::kItemsLengthCap];
-  std::fill(player_indices, player_indices + Gamepads::kItemsLengthCap, false);
-  for (GCController* controller in controllers) {
-    // We only support the extendedGamepad profile, the basic gamepad profile
-    // appears to only be for iOS devices.
-    if (![controller extendedGamepad])
-      continue;
-
-    int player_index = [controller playerIndex];
-    if (player_index != GCControllerPlayerIndexUnset)
-      player_indices[player_index] = true;
-  }
-
-  for (size_t i = 0; i < Gamepads::kItemsLengthCap; ++i) {
-    if (connected_[i] && !player_indices[i])
-      connected_[i] = false;
-  }
-
-  // In the second pass, assign indices to newly connected gamepads and fetch
-  // the gamepad state.
   for (GCController* controller in controllers) {
     auto extended_gamepad = [controller extendedGamepad];
 
+    // We only support the extendedGamepad profile, the basic gamepad profile
+    // appears to only be for iOS devices.
     if (!extended_gamepad)
       continue;
 
     int player_index = [controller playerIndex];
-    if (player_index == GCControllerPlayerIndexUnset) {
-      player_index = NextUnusedPlayerIndex();
-      if (player_index == GCControllerPlayerIndexUnset)
-        continue;
-    }
-
     PadState* state = GetPadState(player_index);
     if (!state)
       continue;
@@ -98,9 +70,6 @@ void GameControllerDataFetcherMac::GetGamepadData(bool) {
       pad.axes_length = AXIS_INDEX_COUNT;
       pad.buttons_length = BUTTON_INDEX_COUNT - 1;
       pad.connected = true;
-      connected_[player_index] = true;
-      [controller
-          setPlayerIndex:static_cast<GCControllerPlayerIndex>(player_index)];
     }
 
     pad.timestamp = base::TimeTicks::Now().ToInternalValue();
@@ -138,12 +107,4 @@ void GameControllerDataFetcherMac::GetGamepadData(bool) {
   }
 }
 
-int GameControllerDataFetcherMac::NextUnusedPlayerIndex() {
-  for (int i = 0; i < kGCControllerPlayerIndexCount; ++i) {
-    if (!connected_[i])
-      return i;
-  }
-  return GCControllerPlayerIndexUnset;
-}
-
 }  // namespace device