Add c/dev/ppb_widget_dev.h and cpp/non_thread_safe_ref_count.h to ppapi.gyp. Add a simple test to ensure all C++ files compile. Re-sorted the includes in test_c_includes.c that uncovered a problem whereby ppapi headers expect pp_stdint.h to include stddef.h, and it wasn't doing it on Windows.

See http://codereview.chromium.org/5190004/ for an attempt at automating the test generation and verification of ppapi.gyp.

BUG=66321
TEST=None

Review URL: http://codereview.chromium.org/5233002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66781 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 86 insertions, 30 deletions

diff --git a/ppapi/c/pp_stdint.h b/ppapi/c/pp_stdint.h
index 3bb11b9..23a7b78 100644
--- a/ppapi/c/pp_stdint.h
+++ b/ppapi/c/pp_stdint.h
@@ -26,9 +26,10 @@ typedef unsigned __int64 uint64_t;
 
 #else
 #include <stdint.h>
-#include <stddef.h>  // Needed for size_t.
 #endif
 
+#include <stddef.h>  // Needed for size_t.
+
 /**
  * @}
  * End addtogroup PP
diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp
index bf8d032..ea81f98 100644
--- a/ppapi/ppapi.gyp
+++ b/ppapi/ppapi.gyp
@@ -91,6 +91,7 @@
         'c/dev/ppb_transport_dev.h',
         'c/dev/ppb_url_util_dev.h',
         'c/dev/ppb_video_decoder_dev.h',
+        'c/dev/ppb_widget_dev.h',
         'c/dev/ppb_zoom_dev.h',
         'c/dev/ppp_cursor_control_dev.h',
         'c/dev/ppp_find_dev.h',
@@ -135,6 +136,7 @@
         'cpp/module.cc',
         'cpp/module.h',
         'cpp/module_impl.h',
+        'cpp/non_thread_safe_ref_count.h',
         'cpp/paint_aggregator.cc',
         'cpp/paint_aggregator.h',
         'cpp/paint_manager.cc',
@@ -424,6 +426,7 @@
         'tests/test_buffer.cc',
         'tests/test_buffer.h',
         'tests/test_c_includes.c',
+        'tests/test_cc_includes.cc',
         'tests/test_char_set.cc',
         'tests/test_char_set.h',
         'tests/test_directory_reader.cc',
diff --git a/ppapi/tests/test_c_includes.c b/ppapi/tests/test_c_includes.c
index 80b221b2..05e8899 100644
--- a/ppapi/tests/test_c_includes.c
+++ b/ppapi/tests/test_c_includes.c
@@ -1,36 +1,10 @@
 /* Copyright (c) 2010 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.
-
- * This test simply includes all the C headers to ensure they compile with a C
-   compiler.  If it compiles, it passes.
+ *
+ * This test simply includes all the C headers to ensure they compile with a
+ * C compiler.  If it compiles, it passes.
  */
-#include "ppapi/c/pp_bool.h"
-#include "ppapi/c/pp_completion_callback.h"
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/c/pp_input_event.h"
-#include "ppapi/c/pp_instance.h"
-#include "ppapi/c/pp_macros.h"
-#include "ppapi/c/pp_module.h"
-#include "ppapi/c/pp_point.h"
-#include "ppapi/c/pp_rect.h"
-#include "ppapi/c/pp_resource.h"
-#include "ppapi/c/pp_size.h"
-#include "ppapi/c/pp_stdint.h"
-#include "ppapi/c/pp_time.h"
-#include "ppapi/c/pp_var.h"
-#include "ppapi/c/ppb.h"
-#include "ppapi/c/ppb_class.h"
-#include "ppapi/c/ppb_core.h"
-#include "ppapi/c/ppb_graphics_2d.h"
-#include "ppapi/c/ppb_image_data.h"
-#include "ppapi/c/ppb_instance.h"
-#include "ppapi/c/ppb_url_loader.h"
-#include "ppapi/c/ppb_url_request_info.h"
-#include "ppapi/c/ppb_url_response_info.h"
-#include "ppapi/c/ppb_var.h"
-#include "ppapi/c/ppp.h"
-#include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/dev/deprecated_bool.h"
 #include "ppapi/c/dev/pp_cursor_type_dev.h"
 #include "ppapi/c/dev/pp_file_info_dev.h"
@@ -69,6 +43,32 @@
 #include "ppapi/c/dev/ppp_selection_dev.h"
 #include "ppapi/c/dev/ppp_widget_dev.h"
 #include "ppapi/c/dev/ppp_zoom_dev.h"
+#include "ppapi/c/pp_bool.h"
+#include "ppapi/c/pp_completion_callback.h"
+#include "ppapi/c/pp_errors.h"
+#include "ppapi/c/pp_input_event.h"
+#include "ppapi/c/pp_instance.h"
+#include "ppapi/c/pp_macros.h"
+#include "ppapi/c/pp_module.h"
+#include "ppapi/c/pp_point.h"
+#include "ppapi/c/pp_rect.h"
+#include "ppapi/c/pp_resource.h"
+#include "ppapi/c/pp_size.h"
+#include "ppapi/c/pp_stdint.h"
+#include "ppapi/c/pp_time.h"
+#include "ppapi/c/pp_var.h"
+#include "ppapi/c/ppb.h"
+#include "ppapi/c/ppb_class.h"
+#include "ppapi/c/ppb_core.h"
+#include "ppapi/c/ppb_graphics_2d.h"
+#include "ppapi/c/ppb_image_data.h"
+#include "ppapi/c/ppb_instance.h"
+#include "ppapi/c/ppb_url_loader.h"
+#include "ppapi/c/ppb_url_request_info.h"
+#include "ppapi/c/ppb_url_response_info.h"
+#include "ppapi/c/ppb_var.h"
+#include "ppapi/c/ppp.h"
+#include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 
diff --git a/ppapi/tests/test_cc_includes.cc b/ppapi/tests/test_cc_includes.cc
new file mode 100644
index 0000000..b22ec00
--- /dev/null
+++ b/ppapi/tests/test_cc_includes.cc
@@ -0,0 +1,52 @@
+// Copyright (c) 2010 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.
+//
+// This test simply includes all the C++ headers to ensure they compile with
+// a C++ compiler.  If it compiles, it passes.
+//
+#include "ppapi/cpp/common.h"
+#include "ppapi/cpp/completion_callback.h"
+#include "ppapi/cpp/core.h"
+#include "ppapi/cpp/dev/audio_config_dev.h"
+#include "ppapi/cpp/dev/audio_dev.h"
+#include "ppapi/cpp/dev/buffer_dev.h"
+#include "ppapi/cpp/dev/directory_entry_dev.h"
+#include "ppapi/cpp/dev/directory_reader_dev.h"
+#include "ppapi/cpp/dev/file_chooser_dev.h"
+#include "ppapi/cpp/dev/file_io_dev.h"
+#include "ppapi/cpp/dev/file_ref_dev.h"
+#include "ppapi/cpp/dev/file_system_dev.h"
+#include "ppapi/cpp/dev/find_dev.h"
+#include "ppapi/cpp/dev/font_dev.h"
+#include "ppapi/cpp/dev/fullscreen_dev.h"
+#include "ppapi/cpp/dev/graphics_3d_client_dev.h"
+#include "ppapi/cpp/dev/graphics_3d_dev.h"
+#include "ppapi/cpp/dev/printing_dev.h"
+#include "ppapi/cpp/dev/scriptable_object_deprecated.h"
+#include "ppapi/cpp/dev/scrollbar_dev.h"
+#include "ppapi/cpp/dev/selection_dev.h"
+#include "ppapi/cpp/dev/transport_dev.h"
+#include "ppapi/cpp/dev/url_util_dev.h"
+#include "ppapi/cpp/dev/video_decoder_dev.h"
+#include "ppapi/cpp/dev/widget_client_dev.h"
+#include "ppapi/cpp/dev/widget_dev.h"
+#include "ppapi/cpp/dev/zoom_dev.h"
+#include "ppapi/cpp/graphics_2d.h"
+#include "ppapi/cpp/image_data.h"
+#include "ppapi/cpp/instance.h"
+#include "ppapi/cpp/logging.h"
+#include "ppapi/cpp/module.h"
+#include "ppapi/cpp/module_impl.h"
+#include "ppapi/cpp/non_thread_safe_ref_count.h"
+#include "ppapi/cpp/paint_aggregator.h"
+#include "ppapi/cpp/paint_manager.h"
+#include "ppapi/cpp/point.h"
+#include "ppapi/cpp/rect.h"
+#include "ppapi/cpp/resource.h"
+#include "ppapi/cpp/size.h"
+#include "ppapi/cpp/url_loader.h"
+#include "ppapi/cpp/url_request_info.h"
+#include "ppapi/cpp/url_response_info.h"
+#include "ppapi/cpp/var.h"
+