Updating Gamepad API to match latest spec

content/browser/renderer_host/pepper/pepper_gamepad_host_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 <string.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/gamepad/gamepad_test_helpers.h"
 #include "content/browser/renderer_host/pepper/browser_ppapi_host_test.h"
@@ skipping 146 matching lines @@
   EXPECT_EQ(0u, sink().message_count());
 
   // Set a button down and wait for it to be read twice.
   //
   // We wait for two reads before calling RunAllPending because the provider
   // will read the data on the background thread (setting the event) and *then*
   // will issue the callback on our thread. Waiting for it to read twice
   // ensures that it was able to issue callbacks for the first read (if it
   // issued one) before we try to check for it.
   blink::WebGamepads button_down_data = default_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;
   fetcher->SetTestData(button_down_data);
   fetcher->WaitForDataRead();
   fetcher->WaitForDataRead();
 
   // It should have sent a callback.
   service_->message_loop().RunUntilIdle();
   ppapi::proxy::ResourceMessageReplyParams reply_params;
   IPC::Message reply_msg;
   ASSERT_TRUE(sink().GetFirstResourceReplyMatching(
       PpapiPluginMsg_Gamepad_SendMemory::ID, &reply_params, &reply_msg));
 
   // Extract the shared memory handle.
   base::SharedMemoryHandle reply_handle;
   EXPECT_TRUE(reply_params.TakeSharedMemoryHandleAtIndex(0, &reply_handle));
 
   // Validate the shared memory.
   base::SharedMemory shared_memory(reply_handle, true);
   EXPECT_TRUE(shared_memory.Map(sizeof(ppapi::ContentGamepadHardwareBuffer)));
   const ppapi::ContentGamepadHardwareBuffer* buffer =
       static_cast<const ppapi::ContentGamepadHardwareBuffer*>(
           shared_memory.memory());
   EXPECT_EQ(button_down_data.length, buffer->buffer.length);
   EXPECT_EQ(button_down_data.items[0].buttonsLength,
             buffer->buffer.items[0].buttons_length);
   for (size_t i = 0; i < ppapi::WebKitGamepad::kButtonsLengthCap; i++) {
-    EXPECT_EQ(button_down_data.items[0].buttons[i],
-              buffer->buffer.items[0].buttons[i]);
+    EXPECT_EQ(button_down_data.items[0].buttons[i].value,
+              buffer->buffer.items[0].buttons[i].value);
+    EXPECT_EQ(button_down_data.items[0].buttons[i].pressed,
+              buffer->buffer.items[0].buttons[i].pressed);
   }
 
   // Duplicate requests should be denied.
   EXPECT_EQ(PP_ERROR_FAILED,
             gamepad_host.OnResourceMessageReceived(
                 PpapiHostMsg_Gamepad_RequestMemory(),
                 &context));
 }
 
 }  // namespace content