21 files changed, 60 insertions, 86 deletions
diff --git a/ppapi/tests/arch_dependent_sizes_32.h b/ppapi/tests/arch_dependent_sizes_32.h
index a6e8699..4be5ad7 100644
--- a/ppapi/tests/arch_dependent_sizes_32.h
+++ b/ppapi/tests/arch_dependent_sizes_32.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* 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.
  *
@@ -16,7 +16,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(GLsizeiptr, 4);
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CompletionCallback_Func, 4);
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLLoaderTrusted_StatusCallback, 4);
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_CompletionCallback, 12);
-PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PPB_VideoDecoder_Dev, 32);
-PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PPP_VideoDecoder_Dev, 20);
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PPB_VideoDecoder_Dev, 32);
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PPP_VideoDecoder_Dev, 20);
 
 #endif  /* PPAPI_TESTS_ARCH_DEPENDENT_SIZES_32_H_ */
diff --git a/ppapi/tests/arch_dependent_sizes_64.h b/ppapi/tests/arch_dependent_sizes_64.h
index a675d18..68f4e05 100644
--- a/ppapi/tests/arch_dependent_sizes_64.h
+++ b/ppapi/tests/arch_dependent_sizes_64.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium Authors. All rights reserved.
+/* 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.
  *
@@ -16,7 +16,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(GLsizeiptr, 8);
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CompletionCallback_Func, 8);
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLLoaderTrusted_StatusCallback, 8);
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_CompletionCallback, 24);
-PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PPB_VideoDecoder_Dev, 64);
-PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PPP_VideoDecoder_Dev, 40);
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PPB_VideoDecoder_Dev, 64);
+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PPP_VideoDecoder_Dev, 40);
 
 #endif  /* PPAPI_TESTS_ARCH_DEPENDENT_SIZES_64_H_ */
diff --git a/ppapi/tests/test_audio.h b/ppapi/tests/test_audio.h
index 61ebc42..6f7883a 100644
--- a/ppapi/tests/test_audio.h
+++ b/ppapi/tests/test_audio.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,12 +7,11 @@
 
 #include <string>
 
+#include "ppapi/c/ppb_audio.h"
+#include "ppapi/c/ppb_audio_config.h"
+#include "ppapi/c/ppb_core.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_Audio;
-struct PPB_AudioConfig;
-struct PPB_Core;
-
 class TestAudio : public TestCase {
  public:
   explicit TestAudio(TestingInstance* instance) : TestCase(instance) {}
diff --git a/ppapi/tests/test_audio_config.h b/ppapi/tests/test_audio_config.h
index b4d6f5d..71a1ae6 100644
--- a/ppapi/tests/test_audio_config.h
+++ b/ppapi/tests/test_audio_config.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,11 +7,10 @@
 
 #include <string>
 
+#include "ppapi/c/ppb_audio_config.h"
+#include "ppapi/c/ppb_core.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_AudioConfig;
-struct PPB_Core;
-
 class TestAudioConfig : public TestCase {
  public:
   explicit TestAudioConfig(TestingInstance* instance) : TestCase(instance) {}
diff --git a/ppapi/tests/test_broker.h b/ppapi/tests/test_broker.h
index 37825da..fa7c903 100644
--- a/ppapi/tests/test_broker.h
+++ b/ppapi/tests/test_broker.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -8,10 +8,9 @@
 #include <string>
 #include <vector>
 
+#include "ppapi/c/trusted/ppb_broker_trusted.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_BrokerTrusted;
-
 class TestBroker : public TestCase {
  public:
   TestBroker(TestingInstance* instance);
@@ -26,7 +25,7 @@ class TestBroker : public TestCase {
   std::string TestGetHandleFailure();
   std::string TestConnectAndPipe();
 
-  const struct PPB_BrokerTrusted* broker_interface_;
+  const PPB_BrokerTrusted* broker_interface_;
 };
 
 #endif  // PPAPI_TESTS_TEST_BROKER_H_
diff --git a/ppapi/tests/test_buffer.h b/ppapi/tests/test_buffer.h
index 7dea017..c0d212c 100644
--- a/ppapi/tests/test_buffer.h
+++ b/ppapi/tests/test_buffer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,10 +7,9 @@
 
 #include <string>
 
+#include "ppapi/c/dev/ppb_buffer_dev.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_Buffer_Dev;
-
 class TestBuffer : public TestCase {
  public:
   explicit TestBuffer(TestingInstance* instance) : TestCase(instance) {}
diff --git a/ppapi/tests/test_case.h b/ppapi/tests/test_case.h
index 75cafda..05fbb05 100644
--- a/ppapi/tests/test_case.h
+++ b/ppapi/tests/test_case.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -10,6 +10,7 @@
 #include <string>
 
 #include "ppapi/c/pp_resource.h"
+#include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/cpp/dev/scrollbar_dev.h"
 
 #if (defined __native_client__)
@@ -18,7 +19,6 @@
 #include "ppapi/cpp/private/var_private.h"
 #endif
 
-struct PPB_Testing_Dev;
 class TestingInstance;
 
 namespace pp {
diff --git a/ppapi/tests/test_char_set.h b/ppapi/tests/test_char_set.h
index 3183e18..f278bef 100644
--- a/ppapi/tests/test_char_set.h
+++ b/ppapi/tests/test_char_set.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -8,10 +8,9 @@
 #include <string>
 #include <vector>
 
+#include "ppapi/c/dev/ppb_char_set_dev.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_CharSet_Dev;
-
 class TestCharSet : public TestCase {
  public:
   TestCharSet(TestingInstance* instance);
@@ -30,7 +29,7 @@ class TestCharSet : public TestCase {
   // stored in the given vector.
   std::vector<uint16_t> UTF8ToUTF16(const std::string& utf8);
 
-  const struct PPB_CharSet_Dev* char_set_interface_;
+  const PPB_CharSet_Dev* char_set_interface_;
 };
 
 #endif  // PPAPI_TESTS_TEST_CHAR_SET_H_
diff --git a/ppapi/tests/test_crypto.h b/ppapi/tests/test_crypto.h
index 681e648..819ad77 100644
--- a/ppapi/tests/test_crypto.h
+++ b/ppapi/tests/test_crypto.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -8,10 +8,9 @@
 #include <string>
 #include <vector>
 
+#include "ppapi/c/dev/ppb_crypto_dev.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_Crypto_Dev;
-
 class TestCrypto : public TestCase {
  public:
   TestCrypto(TestingInstance* instance);
@@ -23,7 +22,7 @@ class TestCrypto : public TestCase {
  private:
   std::string TestGetRandomBytes();
 
-  const struct PPB_Crypto_Dev* crypto_interface_;
+  const PPB_Crypto_Dev* crypto_interface_;
 };
 
 #endif  // PPAPI_TESTS_TEST_CRYPTO_H_
diff --git a/ppapi/tests/test_cursor_control.h b/ppapi/tests/test_cursor_control.h
index 0159660..279b65b 100644
--- a/ppapi/tests/test_cursor_control.h
+++ b/ppapi/tests/test_cursor_control.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -8,10 +8,9 @@
 #include <string>
 #include <vector>
 
+#include "ppapi/c/dev/ppb_cursor_control_dev.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_CursorControl_Dev;
-
 class TestCursorControl : public TestCase {
  public:
   TestCursorControl(TestingInstance* instance);
@@ -23,7 +22,7 @@ class TestCursorControl : public TestCase {
  private:
   std::string TestSetCursor();
 
-  const struct PPB_CursorControl_Dev* cursor_control_interface_;
+  const PPB_CursorControl_Dev* cursor_control_interface_;
 };
 
 #endif  // PPAPI_TESTS_TEST_CURSOR_CONTROL_H_
diff --git a/ppapi/tests/test_flash.h b/ppapi/tests/test_flash.h
index 5dfed88..39c4598 100644
--- a/ppapi/tests/test_flash.h
+++ b/ppapi/tests/test_flash.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -9,10 +9,9 @@
 
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/c/pp_stdint.h"
+#include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_Flash;
-
 class TestFlash : public TestCase {
  public:
   explicit TestFlash(TestingInstance* instance);
diff --git a/ppapi/tests/test_graphics_2d.h b/ppapi/tests/test_graphics_2d.h
index ab3d48f..86eb9a8 100644
--- a/ppapi/tests/test_graphics_2d.h
+++ b/ppapi/tests/test_graphics_2d.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -8,11 +8,10 @@
 #include <string>
 
 #include "ppapi/c/pp_stdint.h"
+#include "ppapi/c/ppb_graphics_2d.h"
+#include "ppapi/c/ppb_image_data.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_Graphics2D;
-struct PPB_ImageData;
-
 namespace pp {
 class Graphics2D;
 class ImageData;
diff --git a/ppapi/tests/test_image_data.h b/ppapi/tests/test_image_data.h
index e6fb969c..b555d6d 100644
--- a/ppapi/tests/test_image_data.h
+++ b/ppapi/tests/test_image_data.h
@@ -1,14 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef PPAPI_TESTS_TEST_IMAGE_DATA_H_
 #define PPAPI_TESTS_TEST_IMAGE_DATA_H_
 
+#include "ppapi/c/ppb_image_data.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_ImageData;
-
 class TestImageData : public TestCase {
  public:
   TestImageData(TestingInstance* instance) : TestCase(instance) {}
diff --git a/ppapi/tests/test_input_event.h b/ppapi/tests/test_input_event.h
index 20a042f..0bf2673 100644
--- a/ppapi/tests/test_input_event.h
+++ b/ppapi/tests/test_input_event.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -8,17 +8,13 @@
 #include <string>
 #include <vector>
 
+#include "ppapi/c/ppb_input_event.h"
+#include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/cpp/input_event.h"
 #include "ppapi/cpp/point.h"
 #include "ppapi/cpp/rect.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_InputEvent;
-struct PPB_MouseInputEvent;
-struct PPB_WheelInputEvent;
-struct PPB_KeyboardInputEvent;
-struct PPB_Testing_Dev;
-
 class TestInputEvent : public TestCase {
  public:
   explicit TestInputEvent(TestingInstance* instance);
@@ -45,10 +41,10 @@ class TestInputEvent : public TestCase {
 
   std::string TestEvents();
 
-  const struct PPB_InputEvent* input_event_interface_;
-  const struct PPB_MouseInputEvent* mouse_input_event_interface_;
-  const struct PPB_WheelInputEvent* wheel_input_event_interface_;
-  const struct PPB_KeyboardInputEvent* keyboard_input_event_interface_;
+  const PPB_InputEvent* input_event_interface_;
+  const PPB_MouseInputEvent* mouse_input_event_interface_;
+  const PPB_WheelInputEvent* wheel_input_event_interface_;
+  const PPB_KeyboardInputEvent* keyboard_input_event_interface_;
 
   pp::Rect view_rect_;
   pp::InputEvent expected_input_event_;
@@ -57,4 +53,3 @@ class TestInputEvent : public TestCase {
 };
 
 #endif  // PPAPI_TESTS_TEST_INPUT_EVENT_H_
-
diff --git a/ppapi/tests/test_memory.h b/ppapi/tests/test_memory.h
index 10c8d79..896f1bd 100644
--- a/ppapi/tests/test_memory.h
+++ b/ppapi/tests/test_memory.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,10 +7,9 @@
 
 #include <string>
 
+#include "ppapi/c/dev/ppb_memory_dev.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_Memory_Dev;
-
 class TestMemory : public TestCase {
  public:
   explicit TestMemory(TestingInstance* instance) : TestCase(instance) {}
@@ -28,4 +27,3 @@ class TestMemory : public TestCase {
 };
 
 #endif  // PPAPI_TEST_TEST_VAR_H_
-
diff --git a/ppapi/tests/test_transport.h b/ppapi/tests/test_transport.h
index 4377515..eee1c2d 100644
--- a/ppapi/tests/test_transport.h
+++ b/ppapi/tests/test_transport.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -10,8 +10,6 @@
 #include "ppapi/c/dev/ppb_transport_dev.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_Transport_Dev;
-
 namespace pp {
 class Transport_Dev;
 }  // namespace pp
diff --git a/ppapi/tests/test_url_loader.h b/ppapi/tests/test_url_loader.h
index c33d51f..8dbef70e 100644
--- a/ppapi/tests/test_url_loader.h
+++ b/ppapi/tests/test_url_loader.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,11 +7,10 @@
 
 #include <string>
 
+#include "ppapi/c/trusted/ppb_file_io_trusted.h"
+#include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_FileIOTrusted;
-struct PPB_URLLoaderTrusted;
-
 namespace pp {
 class FileIO;
 class FileRef;
diff --git a/ppapi/tests/test_var.h b/ppapi/tests/test_var.h
index a329c780..62cb622 100644
--- a/ppapi/tests/test_var.h
+++ b/ppapi/tests/test_var.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,11 +7,10 @@
 
 #include <string>
 
+#include "ppapi/c/ppb_var.h"
 #include "ppapi/cpp/var.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_Var;
-
 class TestVar : public TestCase {
  public:
   explicit TestVar(TestingInstance* instance) : TestCase(instance) {}
@@ -35,4 +34,3 @@ class TestVar : public TestCase {
 };
 
 #endif  // PPAPI_TEST_TEST_VAR_H_
-
diff --git a/ppapi/tests/test_var_deprecated.h b/ppapi/tests/test_var_deprecated.h
index d8b86b8..26180a6 100644
--- a/ppapi/tests/test_var_deprecated.h
+++ b/ppapi/tests/test_var_deprecated.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,11 +7,10 @@
 
 #include <string>
 
+#include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/cpp/private/var_private.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_Var_Deprecated;
-
 class TestVarDeprecated : public TestCase {
  public:
   explicit TestVarDeprecated(TestingInstance* instance) : TestCase(instance) {}
@@ -45,4 +44,3 @@ class TestVarDeprecated : public TestCase {
 };
 
 #endif  // PPAPI_TEST_TEST_VAR_DEPRECATED_H_
-
diff --git a/ppapi/tests/test_video_decoder.h b/ppapi/tests/test_video_decoder.h
index 0b494c5..e6d7e66 100644
--- a/ppapi/tests/test_video_decoder.h
+++ b/ppapi/tests/test_video_decoder.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,11 +7,10 @@
 
 #include <string>
 
+#include "ppapi/c/dev/ppb_video_decoder_dev.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_VideoDecoder_Dev;
-
 class TestVideoDecoder : public TestCase {
  public:
   explicit TestVideoDecoder(TestingInstance* instance) : TestCase(instance) {}
diff --git a/ppapi/tests/test_websocket.h b/ppapi/tests/test_websocket.h
index 1f16489..a973ead 100644
--- a/ppapi/tests/test_websocket.h
+++ b/ppapi/tests/test_websocket.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -7,13 +7,12 @@
 
 #include <string>
 
+#include "ppapi/c/dev/ppb_var_array_buffer_dev.h"
+#include "ppapi/c/dev/ppb_websocket_dev.h"
+#include "ppapi/c/ppb_core.h"
+#include "ppapi/c/ppb_var.h"
 #include "ppapi/tests/test_case.h"
 
-struct PPB_Core;
-struct PPB_Var;
-struct PPB_VarArrayBuffer_Dev;
-struct PPB_WebSocket_Dev;
-
 class TestWebSocket : public TestCase {
  public:
   explicit TestWebSocket(TestingInstance* instance) : TestCase(instance) {}