Updating Gamepad API to match latest spec

content/browser/gamepad/gamepad_provider_unittest.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 "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/gamepad/gamepad_data_fetcher.h"
 #include "content/browser/gamepad/gamepad_provider.h"
 #include "content/browser/gamepad/gamepad_test_helpers.h"
 #include "content/common/gamepad_hardware_buffer.h"
@@ skipping 53 matching lines @@
 };
 
 // Crashes. http://crbug.com/106163
 TEST_F(GamepadProviderTest, PollingAccess) {
   WebGamepads test_data;
   test_data.length = 1;
   test_data.items[0].connected = true;
   test_data.items[0].timestamp = 0;
   test_data.items[0].buttonsLength = 1;
   test_data.items[0].axesLength = 2;
-  test_data.items[0].buttons[0] = 1.f;
+  test_data.items[0].buttons[0].value = 1.f;
+  test_data.items[0].buttons[0].pressed = true;
   test_data.items[0].axes[0] = -1.f;
   test_data.items[0].axes[1] = .5f;
 
   GamepadProvider* provider = CreateProvider(test_data);
   provider->Resume();
 
   message_loop().RunUntilIdle();
 
   mock_data_fetcher_->WaitForDataRead();
 
@@ skipping 10 matching lines @@
   WebGamepads output;
 
   base::subtle::Atomic32 version;
   do {
     version = hwbuf->sequence.ReadBegin();
     memcpy(&output, &hwbuf->buffer, sizeof(output));
   } while (hwbuf->sequence.ReadRetry(version));
 
   EXPECT_EQ(1u, output.length);
   EXPECT_EQ(1u, output.items[0].buttonsLength);
-  EXPECT_EQ(1.f, output.items[0].buttons[0]);
+  EXPECT_EQ(1.f, output.items[0].buttons[0].value);
+  EXPECT_EQ(true, output.items[0].buttons[0].pressed);
   EXPECT_EQ(2u, output.items[0].axesLength);
   EXPECT_EQ(-1.f, output.items[0].axes[0]);
   EXPECT_EQ(0.5f, output.items[0].axes[1]);
 }
 
 // Tests that waiting for a user gesture works properly.
 TEST_F(GamepadProviderTest, UserGesture) {
   WebGamepads no_button_data;
   no_button_data.length = 1;
   no_button_data.items[0].connected = true;
   no_button_data.items[0].timestamp = 0;
   no_button_data.items[0].buttonsLength = 1;
   no_button_data.items[0].axesLength = 2;
-  no_button_data.items[0].buttons[0] = 0.f;
+  no_button_data.items[0].buttons[0].value = 0.f;
+  no_button_data.items[0].buttons[0].pressed = false;
   no_button_data.items[0].axes[0] = -1.f;
   no_button_data.items[0].axes[1] = .5f;
 
   WebGamepads button_down_data = no_button_data;
-  button_down_data.items[0].buttons[0] = 1.f;
+  button_down_data.items[0].buttons[0].value = 1.f;
+  button_down_data.items[0].buttons[0].pressed = true;
 
   UserGestureListener listener;
   GamepadProvider* provider = CreateProvider(no_button_data);
   provider->Resume();
 
   // Register for a user gesture and make sure the provider reads it twice
   // see below for why).
   provider->RegisterForUserGesture(listener.GetClosure());
   mock_data_fetcher_->WaitForDataRead();
   mock_data_fetcher_->WaitForDataRead();
@@ skipping 14 matching lines @@
   mock_data_fetcher_->WaitForDataRead();
 
   // It should have issued our callback.
   message_loop().RunUntilIdle();
   EXPECT_TRUE(listener.has_user_gesture());
 }
 
 }  // namespace
 
 }  // namespace content