Fix header guards in ppapi/ [1/2]

Generated mechanically as follows:

git ls-files '*.h' | grep -E '^ppapi/' |\
grep -v third_party | grep -v ppapi/lib/gl |\
grep -v ppapi/generators/ |\
parallel --xargs cpplint.py --filter=-,+build/header_guard -- 2>&1 |\
grep build/header | head -68 |\
tools/apply_cpplint_header_guard.py

Bug: 1200694
Change-Id: I696ec66ca656c70950c6e78f03d8a542dd9734a2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3026804
Reviewed-by: Henrique Ferreiro <hferreiro@igalia.com>
Reviewed-by: Bill Budge <bbudge@chromium.org>
Commit-Queue: Sumaid <ssyed@igalia.com>
Cr-Commit-Position: refs/heads/master@{#906599}

diff --git a/ppapi/c/dev/deprecated_bool.h b/ppapi/c/dev/deprecated_bool.h
index 6c66dff..4fe660d 100644
--- a/ppapi/c/dev/deprecated_bool.h
+++ b/ppapi/c/dev/deprecated_bool.h

@@ -39,5 +39,5 @@
  * End addtogroup PP
  */
 
-#endif  /* PPAPI_C_DEV_DEPRECATED_BOOL_H_ */
+#endif  // PPAPI_C_DEV_DEPRECATED_BOOL_H_
 

diff --git a/ppapi/c/dev/ppb_char_set_dev.h b/ppapi/c/dev/ppb_char_set_dev.h
index 36ab825660..37ed4bab 100644
--- a/ppapi/c/dev/ppb_char_set_dev.h
+++ b/ppapi/c/dev/ppb_char_set_dev.h

@@ -82,4 +82,4 @@
 
 typedef struct PPB_CharSet_Dev_0_4 PPB_CharSet_Dev;
 
-#endif  /* PPAPI_C_DEV_PPB_CHAR_SET_DEV_H_ */
+#endif  // PPAPI_C_DEV_PPB_CHAR_SET_DEV_H_

diff --git a/ppapi/c/dev/ppb_var_deprecated.h b/ppapi/c/dev/ppb_var_deprecated.h
index 3970f4787..5360c2a 100644
--- a/ppapi/c/dev/ppb_var_deprecated.h
+++ b/ppapi/c/dev/ppb_var_deprecated.h

@@ -2,8 +2,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef PPAPI_C_PPB_VAR_DEPRECATED_H_
-#define PPAPI_C_PPB_VAR_DEPRECATED_H_
+#ifndef PPAPI_C_DEV_PPB_VAR_DEPRECATED_H_
+#define PPAPI_C_DEV_PPB_VAR_DEPRECATED_H_
 
 #include "ppapi/c/dev/deprecated_bool.h"
 #include "ppapi/c/pp_instance.h"
@@ -250,5 +250,5 @@
  * @}
  * End addtogroup PPB
  */
-#endif  /* PPAPI_C_PPB_VAR_DEPRECATED_H_ */
+#endif  // PPAPI_C_DEV_PPB_VAR_DEPRECATED_H_
 

diff --git a/ppapi/c/dev/ppp_class_deprecated.h b/ppapi/c/dev/ppp_class_deprecated.h
index 0f39d264..6b4ffbe 100644
--- a/ppapi/c/dev/ppp_class_deprecated.h
+++ b/ppapi/c/dev/ppp_class_deprecated.h

@@ -2,8 +2,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef PPAPI_C_PPP_CLASS_DEPRECATED_H_
-#define PPAPI_C_PPP_CLASS_DEPRECATED_H_
+#ifndef PPAPI_C_DEV_PPP_CLASS_DEPRECATED_H_
+#define PPAPI_C_DEV_PPP_CLASS_DEPRECATED_H_
 
 #include "ppapi/c/dev/deprecated_bool.h"
 #include "ppapi/c/pp_stdint.h"
@@ -131,5 +131,5 @@
  * @}
  * End addtogroup PPP
  */
-#endif  /* PPAPI_C_PPP_CLASS_DEPRECATED_H_ */
+#endif  // PPAPI_C_DEV_PPP_CLASS_DEPRECATED_H_
 

diff --git a/ppapi/c/ppb_opengles2.h b/ppapi/c/ppb_opengles2.h
index 88473777..b3ac0e6a 100644
--- a/ppapi/c/ppb_opengles2.h
+++ b/ppapi/c/ppb_opengles2.h

@@ -1191,5 +1191,5 @@
  * @}
  */
 
-#endif  /* PPAPI_C_PPB_OPENGLES2_H_ */
+#endif  // PPAPI_C_PPB_OPENGLES2_H_
 

diff --git a/ppapi/c/private/ppb_proxy_private.h b/ppapi/c/private/ppb_proxy_private.h
index b185c2c..843114f 100644
--- a/ppapi/c/private/ppb_proxy_private.h
+++ b/ppapi/c/private/ppb_proxy_private.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_C_PRIVATE_PROXY_PRIVATE_H_
-#define PPAPI_C_PRIVATE_PROXY_PRIVATE_H_
+#ifndef PPAPI_C_PRIVATE_PPB_PROXY_PRIVATE_H_
+#define PPAPI_C_PRIVATE_PPB_PROXY_PRIVATE_H_
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
@@ -44,4 +44,4 @@
   PP_Bool (*IsInModuleDestructor)(PP_Module module);
 };
 
-#endif  // PPAPI_C_PRIVATE_PROXY_PRIVATE_H_
+#endif  // PPAPI_C_PRIVATE_PPB_PROXY_PRIVATE_H_

diff --git a/ppapi/cpp/dev/scriptable_object_deprecated.h b/ppapi/cpp/dev/scriptable_object_deprecated.h
index 7423d23..e6e158b 100644
--- a/ppapi/cpp/dev/scriptable_object_deprecated.h
+++ b/ppapi/cpp/dev/scriptable_object_deprecated.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_CPP_SCRIPTABLE_OBJECT_DEPRECATED_H_
-#define PPAPI_CPP_SCRIPTABLE_OBJECT_DEPRECATED_H_
+#ifndef PPAPI_CPP_DEV_SCRIPTABLE_OBJECT_DEPRECATED_H_
+#define PPAPI_CPP_DEV_SCRIPTABLE_OBJECT_DEPRECATED_H_
 
 #include <vector>
 
@@ -89,5 +89,5 @@
 
 }  // namespace pp
 
-#endif  // PPAPI_CPP_SCRIPTABLE_OBJECT_DEPRECATED_H_
+#endif  // PPAPI_CPP_DEV_SCRIPTABLE_OBJECT_DEPRECATED_H_
 

diff --git a/ppapi/cpp/private/camera_capabilities_private.h b/ppapi/cpp/private/camera_capabilities_private.h
index e0dbfe328..9481cfd 100644
--- a/ppapi/cpp/private/camera_capabilities_private.h
+++ b/ppapi/cpp/private/camera_capabilities_private.h

@@ -70,4 +70,4 @@
 
 }  // namespace pp
 
-#endif  /* PPAPI_CPP_PRIVATE_CAMERA_CAPABILITIES_PRIVATE_H_ */
+#endif  // PPAPI_CPP_PRIVATE_CAMERA_CAPABILITIES_PRIVATE_H_

diff --git a/ppapi/cpp/private/camera_device_private.h b/ppapi/cpp/private/camera_device_private.h
index 2e504a3..8ec573d1 100644
--- a/ppapi/cpp/private/camera_device_private.h
+++ b/ppapi/cpp/private/camera_device_private.h

@@ -102,4 +102,4 @@
 
 } // namespace pp
 
-#endif  /* PPAPI_CPP_PRIVATE_CAMERA_DEVICE_PRIVATE_H_ */
+#endif  // PPAPI_CPP_PRIVATE_CAMERA_DEVICE_PRIVATE_H_

diff --git a/ppapi/cpp/private/ext_crx_file_system_private.h b/ppapi/cpp/private/ext_crx_file_system_private.h
index 19f1b1e1..ab970eb 100644
--- a/ppapi/cpp/private/ext_crx_file_system_private.h
+++ b/ppapi/cpp/private/ext_crx_file_system_private.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_CPP_PRIVATE_EXTENSION_CRX_FILE_SYSTEM_PRIVATE_H_
-#define PPAPI_CPP_PRIVATE_EXTENSION_CRX_FILE_SYSTEM_PRIVATE_H_
+#ifndef PPAPI_CPP_PRIVATE_EXT_CRX_FILE_SYSTEM_PRIVATE_H_
+#define PPAPI_CPP_PRIVATE_EXT_CRX_FILE_SYSTEM_PRIVATE_H_
 
 #include <stdint.h>
 
@@ -28,4 +28,4 @@
 
 }  // namespace pp
 
-#endif  // PPAPI_CPP_PRIVATE_EXTENSION_CRX_FILE_SYSTEM_PRIVATE_H_
+#endif  // PPAPI_CPP_PRIVATE_EXT_CRX_FILE_SYSTEM_PRIVATE_H_

diff --git a/ppapi/cpp/rect.h b/ppapi/cpp/rect.h
index 7973a83d..c5f6163 100644
--- a/ppapi/cpp/rect.h
+++ b/ppapi/cpp/rect.h

@@ -839,5 +839,5 @@
   return !(lhs == rhs);
 }
 
-#endif
+#endif  // PPAPI_CPP_RECT_H_
 

diff --git a/ppapi/cpp/touch_point.h b/ppapi/cpp/touch_point.h
index 2dc8951..8fbfa37 100644
--- a/ppapi/cpp/touch_point.h
+++ b/ppapi/cpp/touch_point.h

@@ -63,4 +63,4 @@
 
 }  // namespace pp
 
-#endif  /* PPAPI_CPP_TOUCH_POINT_H_ */
+#endif  // PPAPI_CPP_TOUCH_POINT_H_

diff --git a/ppapi/host/ppapi_host.h b/ppapi/host/ppapi_host.h
index f806b46..99ef2b39 100644
--- a/ppapi/host/ppapi_host.h
+++ b/ppapi/host/ppapi_host.h

@@ -147,4 +147,4 @@
 }  // namespace host
 }  // namespace ppapi
 
-#endif  // PPAPI_HOST_PPAPIE_HOST_H_
+#endif  // PPAPI_HOST_PPAPI_HOST_H_

diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h b/ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h
index d8618fb..ee9d170 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h

@@ -4,8 +4,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PPRUNTIME_H_
-#define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PPRUNTIME_H_
+#ifndef PPAPI_NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PPRUNTIME_H_
+#define PPAPI_NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PPRUNTIME_H_
 
 #include "native_client/src/include/portability.h"
 #include "ppapi/nacl_irt/public/irt_ppapi.h"
@@ -17,4 +17,4 @@
 
 EXTERN_C_END
 
-#endif  // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PPRUNTIME_H_
+#endif  // PPAPI_NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PPRUNTIME_H_

diff --git a/ppapi/native_client/src/untrusted/irt_stub/ppapi_start.h b/ppapi/native_client/src/untrusted/irt_stub/ppapi_start.h
index 7433d8ad..57243d4 100644
--- a/ppapi/native_client/src/untrusted/irt_stub/ppapi_start.h
+++ b/ppapi/native_client/src/untrusted/irt_stub/ppapi_start.h

@@ -4,8 +4,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef NATIVE_CLIENT_SRC_UNTRUSTED_IRT_STUB_PPAPI_START_H_
-#define NATIVE_CLIENT_SRC_UNTRUSTED_IRT_STUB_PPAPI_START_H_
+#ifndef PPAPI_NATIVE_CLIENT_SRC_UNTRUSTED_IRT_STUB_PPAPI_START_H_
+#define PPAPI_NATIVE_CLIENT_SRC_UNTRUSTED_IRT_STUB_PPAPI_START_H_
 
 #include "ppapi/nacl_irt/public/irt_ppapi.h"
 
@@ -16,4 +16,4 @@
  */
 int PpapiPluginStart(const struct PP_StartFunctions *funcs);
 
-#endif
+#endif  // PPAPI_NATIVE_CLIENT_SRC_UNTRUSTED_IRT_STUB_PPAPI_START_H_

diff --git a/ppapi/native_client/src/untrusted/irt_stub/thread_creator.h b/ppapi/native_client/src/untrusted/irt_stub/thread_creator.h
index c71ddb55..aeb80b03 100644
--- a/ppapi/native_client/src/untrusted/irt_stub/thread_creator.h
+++ b/ppapi/native_client/src/untrusted/irt_stub/thread_creator.h

@@ -4,8 +4,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef NATIVE_CLIENT_SRC_UNTRUSTED_IRT_STUB_THREAD_CREATOR_H_
-#define NATIVE_CLIENT_SRC_UNTRUSTED_IRT_STUB_THREAD_CREATOR_H_
+#ifndef PPAPI_NATIVE_CLIENT_SRC_UNTRUSTED_IRT_STUB_THREAD_CREATOR_H_
+#define PPAPI_NATIVE_CLIENT_SRC_UNTRUSTED_IRT_STUB_THREAD_CREATOR_H_
 
 #include "native_client/src/untrusted/irt/irt.h"
 #include "ppapi/nacl_irt/public/irt_ppapi.h"
@@ -20,4 +20,4 @@
 }  // extern "C"
 #endif
 
-#endif
+#endif  // PPAPI_NATIVE_CLIENT_SRC_UNTRUSTED_IRT_STUB_THREAD_CREATOR_H_

diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.h b/ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.h
index 34c23a5..18f50ce9 100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.h
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.h

@@ -27,4 +27,4 @@
 
 #endif
 
-#endif
+#endif  // PPAPI_NATIVE_CLIENT_SRC_UNTRUSTED_PNACL_IRT_SHIM_IRT_SHIM_PPAPI_H_

diff --git a/ppapi/proxy/plugin_resource_var.h b/ppapi/proxy/plugin_resource_var.h
index 2f7d0858..863c23b 100644
--- a/ppapi/proxy/plugin_resource_var.h
+++ b/ppapi/proxy/plugin_resource_var.h

@@ -38,4 +38,4 @@
   DISALLOW_COPY_AND_ASSIGN(PluginResourceVar);
 };
 
-#endif
+#endif  // PPAPI_PROXY_PLUGIN_RESOURCE_VAR_H_

diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.h b/ppapi/proxy/ppapi_command_buffer_proxy.h
index ce2697a5..d3d2138 100644
--- a/ppapi/proxy/ppapi_command_buffer_proxy.h
+++ b/ppapi/proxy/ppapi_command_buffer_proxy.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_
-#define PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_
+#ifndef PPAPI_PROXY_PPAPI_COMMAND_BUFFER_PROXY_H_
+#define PPAPI_PROXY_PPAPI_COMMAND_BUFFER_PROXY_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -114,4 +114,4 @@
 }  // namespace proxy
 }  // namespace ppapi
 
-#endif // PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_
+#endif  // PPAPI_PROXY_PPAPI_COMMAND_BUFFER_PROXY_H_

diff --git a/ppapi/proxy/ppb_image_data_proxy.h b/ppapi/proxy/ppb_image_data_proxy.h
index 6e97221..afdbf49 100644
--- a/ppapi/proxy/ppb_image_data_proxy.h
+++ b/ppapi/proxy/ppb_image_data_proxy.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_PPB_IMAGE_DATA_PROXY_H_
-#define PPAPI_PPB_IMAGE_DATA_PROXY_H_
+#ifndef PPAPI_PROXY_PPB_IMAGE_DATA_PROXY_H_
+#define PPAPI_PROXY_PPB_IMAGE_DATA_PROXY_H_
 
 #include <stdint.h>
 
@@ -193,4 +193,4 @@
 }  // namespace proxy
 }  // namespace ppapi
 
-#endif  // PPAPI_PPB_IMAGE_DATA_PROXY_H_
+#endif  // PPAPI_PROXY_PPB_IMAGE_DATA_PROXY_H_

diff --git a/ppapi/proxy/serialized_handle.h b/ppapi/proxy/serialized_handle.h
index 4e1d1ec..243e948 100644
--- a/ppapi/proxy/serialized_handle.h
+++ b/ppapi/proxy/serialized_handle.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_PROXY_SERIALIZED_HANDLES_H_
-#define PPAPI_PROXY_SERIALIZED_HANDLES_H_
+#ifndef PPAPI_PROXY_SERIALIZED_HANDLE_H_
+#define PPAPI_PROXY_SERIALIZED_HANDLE_H_
 
 #include <stdint.h>
 
@@ -171,4 +171,4 @@
 }  // namespace proxy
 }  // namespace ppapi
 
-#endif  // PPAPI_PROXY_SERIALIZED_HANDLES_H_
+#endif  // PPAPI_PROXY_SERIALIZED_HANDLE_H_

diff --git a/ppapi/shared_impl/file_ref_create_info.h b/ppapi/shared_impl/file_ref_create_info.h
index a3cb466..d19f9af 100644
--- a/ppapi/shared_impl/file_ref_create_info.h
+++ b/ppapi/shared_impl/file_ref_create_info.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_SHARED_IMPL_FILE_REF_CREATE_INFO_H
-#define PPAPI_SHARED_IMPL_FILE_REF_CREATE_INFO_H
+#ifndef PPAPI_SHARED_IMPL_FILE_REF_CREATE_INFO_H_
+#define PPAPI_SHARED_IMPL_FILE_REF_CREATE_INFO_H_
 
 #include <string>
 
@@ -49,4 +49,4 @@
 
 }  // namespace ppapi
 
-#endif  // PPAPI_SHARED_IMPL_FILE_REF_CREATE_INFO_H
+#endif  // PPAPI_SHARED_IMPL_FILE_REF_CREATE_INFO_H_

diff --git a/ppapi/shared_impl/media_stream_buffer_manager.h b/ppapi/shared_impl/media_stream_buffer_manager.h
index 053eb57b..8d6cae7 100644
--- a/ppapi/shared_impl/media_stream_buffer_manager.h
+++ b/ppapi/shared_impl/media_stream_buffer_manager.h

@@ -106,4 +106,4 @@
 
 }  // namespace ppapi
 
-#endif  // PPAPI_SHAERD_IMPL_MEDIA_STREAM_BUFFER_MANAGER_H_
+#endif  // PPAPI_SHARED_IMPL_MEDIA_STREAM_BUFFER_MANAGER_H_

diff --git a/ppapi/shared_impl/ppapi_nacl_plugin_args.h b/ppapi/shared_impl/ppapi_nacl_plugin_args.h
index 2f18c8e02..44b2ebf 100644
--- a/ppapi/shared_impl/ppapi_nacl_plugin_args.h
+++ b/ppapi/shared_impl/ppapi_nacl_plugin_args.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_SHARED_IMPL_PPAPI_NACL_PLUGIN_ARGS_H
-#define PPAPI_SHARED_IMPL_PPAPI_NACL_PLUGIN_ARGS_H
+#ifndef PPAPI_SHARED_IMPL_PPAPI_NACL_PLUGIN_ARGS_H_
+#define PPAPI_SHARED_IMPL_PPAPI_NACL_PLUGIN_ARGS_H_
 
 #include <string>
 #include <vector>
@@ -28,4 +28,4 @@
 
 }  // namespace ppapi
 
-#endif  // PPAPI_SHARED_IMPL_PPAPI_NACL_PLUGIN_ARGS_H
+#endif  // PPAPI_SHARED_IMPL_PPAPI_NACL_PLUGIN_ARGS_H_

diff --git a/ppapi/shared_impl/ppb_graphics_3d_shared.h b/ppapi/shared_impl/ppb_graphics_3d_shared.h
index a452446..c72b33f 100644
--- a/ppapi/shared_impl/ppb_graphics_3d_shared.h
+++ b/ppapi/shared_impl/ppb_graphics_3d_shared.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_SHARED_IMPL_GRAPHICS_3D_IMPL_H_
-#define PPAPI_SHARED_IMPL_GRAPHICS_3D_IMPL_H_
+#ifndef PPAPI_SHARED_IMPL_PPB_GRAPHICS_3D_SHARED_H_
+#define PPAPI_SHARED_IMPL_PPB_GRAPHICS_3D_SHARED_H_
 
 #include <stdint.h>
 
@@ -97,4 +97,4 @@
 
 }  // namespace ppapi
 
-#endif  // PPAPI_SHARED_IMPL_GRAPHICS_3D_IMPL_H_
+#endif  // PPAPI_SHARED_IMPL_PPB_GRAPHICS_3D_SHARED_H_

diff --git a/ppapi/shared_impl/private/ppb_char_set_shared.h b/ppapi/shared_impl/private/ppb_char_set_shared.h
index b277c20..5094d707 100644
--- a/ppapi/shared_impl/private/ppb_char_set_shared.h
+++ b/ppapi/shared_impl/private/ppb_char_set_shared.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_SHARED_IMPL_PPB_CHAR_SET_SHARED_H_
-#define PPAPI_SHARED_IMPL_PPB_CHAR_SET_SHARED_H_
+#ifndef PPAPI_SHARED_IMPL_PRIVATE_PPB_CHAR_SET_SHARED_H_
+#define PPAPI_SHARED_IMPL_PRIVATE_PPB_CHAR_SET_SHARED_H_
 
 #include <stdint.h>
 
@@ -44,4 +44,4 @@
 
 }  // namespace ppapi
 
-#endif  // PPAPI_SHARED_IMPL_PPB_CHAR_SET_SHARED_H_
+#endif  // PPAPI_SHARED_IMPL_PRIVATE_PPB_CHAR_SET_SHARED_H_

diff --git a/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h b/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h
index 786dcc17..3878c41c 100644
--- a/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h
+++ b/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_SHARED_IMPL_PRIVATE_PPB_X509_CERTIFICATE_PRIVATE_IMPL_H_
-#define PPAPI_SHARED_IMPL_PRIVATE_PPB_X509_CERTIFICATE_PRIVATE_IMPL_H_
+#ifndef PPAPI_SHARED_IMPL_PRIVATE_PPB_X509_CERTIFICATE_PRIVATE_SHARED_H_
+#define PPAPI_SHARED_IMPL_PRIVATE_PPB_X509_CERTIFICATE_PRIVATE_SHARED_H_
 
 #include <stdint.h>
 
@@ -74,4 +74,4 @@
 
 }  // namespace ppapi
 
-#endif  // PPAPI_SHARED_IMPL_PRIVATE_X509_CERTIFICATE_PRIVATE_IMPL_H_
+#endif  // PPAPI_SHARED_IMPL_PRIVATE_PPB_X509_CERTIFICATE_PRIVATE_SHARED_H_

diff --git a/ppapi/shared_impl/scoped_pp_resource.h b/ppapi/shared_impl/scoped_pp_resource.h
index b42e21e..b77a1f1 100644
--- a/ppapi/shared_impl/scoped_pp_resource.h
+++ b/ppapi/shared_impl/scoped_pp_resource.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_SHARED_IMPL_SCOPED_RESOURCE_H_
-#define PPAPI_SHARED_IMPL_SCOPED_RESOURCE_H_
+#ifndef PPAPI_SHARED_IMPL_SCOPED_PP_RESOURCE_H_
+#define PPAPI_SHARED_IMPL_SCOPED_PP_RESOURCE_H_
 
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
@@ -56,4 +56,4 @@
 
 }  // namespace ppapi
 
-#endif  // PPAPI_SHARED_IMPL_SCOPED_RESOURCE_H_
+#endif  // PPAPI_SHARED_IMPL_SCOPED_PP_RESOURCE_H_

diff --git a/ppapi/shared_impl/vpn_provider_util.h b/ppapi/shared_impl/vpn_provider_util.h
index e8ac6bf..6013c92 100644
--- a/ppapi/shared_impl/vpn_provider_util.h
+++ b/ppapi/shared_impl/vpn_provider_util.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_SHAERD_IMPL_VPN_PROVIDER_UTIL_H_
-#define PPAPI_SHAERD_IMPL_VPN_PROVIDER_UTIL_H_
+#ifndef PPAPI_SHARED_IMPL_VPN_PROVIDER_UTIL_H_
+#define PPAPI_SHARED_IMPL_VPN_PROVIDER_UTIL_H_
 
 #include <memory>
 
@@ -39,4 +39,4 @@
 
 }  // namespace ppapi
 
-#endif  // PPAPI_SHAERD_IMPL_VPN_PROVIDER_UTIL_H_
+#endif  // PPAPI_SHARED_IMPL_VPN_PROVIDER_UTIL_H_

diff --git a/ppapi/tests/test_audio.h b/ppapi/tests/test_audio.h
index 972aea84..112540f9 100644
--- a/ppapi/tests/test_audio.h
+++ b/ppapi/tests/test_audio.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PAPPI_TESTS_TEST_AUDIO_H_
-#define PAPPI_TESTS_TEST_AUDIO_H_
+#ifndef PPAPI_TESTS_TEST_AUDIO_H_
+#define PPAPI_TESTS_TEST_AUDIO_H_
 
 #include <stdint.h>
 
@@ -80,4 +80,4 @@
   const PPB_Core* core_interface_;
 };
 
-#endif  // PAPPI_TESTS_TEST_AUDIO_H_
+#endif  // PPAPI_TESTS_TEST_AUDIO_H_

diff --git a/ppapi/tests/test_audio_config.h b/ppapi/tests/test_audio_config.h
index 55abc67..738f9c9 100644
--- a/ppapi/tests/test_audio_config.h
+++ b/ppapi/tests/test_audio_config.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PAPPI_TESTS_TEST_AUDIO_CONFIG_H_
-#define PAPPI_TESTS_TEST_AUDIO_CONFIG_H_
+#ifndef PPAPI_TESTS_TEST_AUDIO_CONFIG_H_
+#define PPAPI_TESTS_TEST_AUDIO_CONFIG_H_
 
 #include <string>
 
@@ -28,4 +28,4 @@
   const PPB_Core* core_interface_;
 };
 
-#endif  // PAPPI_TESTS_TEST_AUDIO_CONFIG_H_
+#endif  // PPAPI_TESTS_TEST_AUDIO_CONFIG_H_

diff --git a/ppapi/tests/test_buffer.h b/ppapi/tests/test_buffer.h
index c0d212c..08b65fde 100644
--- a/ppapi/tests/test_buffer.h
+++ b/ppapi/tests/test_buffer.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PAPPI_TESTS_TEST_BUFFER_H_
-#define PAPPI_TESTS_TEST_BUFFER_H_
+#ifndef PPAPI_TESTS_TEST_BUFFER_H_
+#define PPAPI_TESTS_TEST_BUFFER_H_
 
 #include <string>
 
@@ -28,4 +28,4 @@
   const PPB_Buffer_Dev* buffer_interface_;
 };
 
-#endif  // PAPPI_TESTS_TEST_BUFFER_H_
+#endif  // PPAPI_TESTS_TEST_BUFFER_H_