From 97b95bf18b114f0308e2b5e9cc0d9fd32f8a7463 Mon Sep 17 00:00:00 2001
From: Sumaid Syed <ssyed@igalia.com>
Date: Thu, 29 Jul 2021 06:23:34 +0000
Subject: [PATCH] Fix header guards in ppapi/ [2/2]

Generated mechanically as follows:

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

Bug: 1200694
Change-Id: I4dc8b77aa26d36e15ac995fc350c3a767d47abba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3026588
Reviewed-by: Bill Budge <bbudge@chromium.org>
Reviewed-by: Henrique Ferreiro <hferreiro@igalia.com>
Commit-Queue: Sumaid <ssyed@igalia.com>
Cr-Commit-Position: refs/heads/master@{#906597}
---
 ppapi/tests/test_file_io.h                                | 6 +++---
 ppapi/tests/test_file_ref.h                               | 6 +++---
 ppapi/tests/test_file_system.h                            | 6 +++---
 ppapi/tests/test_fullscreen.h                             | 6 +++---
 ppapi/tests/test_graphics_3d.h                            | 6 +++---
 ppapi/tests/test_instance_deprecated.h                    | 6 +++---
 ppapi/tests/test_media_stream_video_track.h               | 6 +++---
 ppapi/tests/test_memory.h                                 | 6 +++---
 ppapi/tests/test_message_loop.h                           | 6 +++---
 ppapi/tests/test_nacl_irt_stack_alignment.h               | 6 +++---
 ppapi/tests/test_net_address.h                            | 6 +++---
 ppapi/tests/test_net_address_private.h                    | 6 +++---
 ppapi/tests/test_net_address_private_untrusted.h          | 6 +++---
 ppapi/tests/test_network_monitor.h                        | 6 +++---
 ppapi/tests/test_network_proxy.h                          | 6 +++---
 ppapi/tests/test_pdf.h                                    | 6 +++---
 ppapi/tests/test_tcp_socket.h                             | 6 +++---
 ppapi/tests/test_tcp_socket_private.h                     | 6 +++---
 ppapi/tests/test_tcp_socket_private_trusted.h             | 6 +++---
 ppapi/tests/test_uma.h                                    | 6 +++---
 ppapi/tests/test_url_request.h                            | 6 +++---
 ppapi/tests/test_var.h                                    | 6 +++---
 ppapi/tests/test_var_deprecated.h                         | 6 +++---
 ppapi/tests/test_var_resource.h                           | 6 +++---
 ppapi/tests/test_view.h                                   | 6 +++---
 ppapi/tests/test_x509_certificate_private.h               | 6 +++---
 ppapi/thunk/ppb_audio_config_api.h                        | 6 +++---
 ppapi/thunk/ppb_audio_input_api.h                         | 6 +++---
 ppapi/thunk/ppb_audio_output_api.h                        | 6 +++---
 ppapi/thunk/ppb_host_resolver_api.h                       | 2 +-
 ppapi/thunk/ppb_host_resolver_private_api.h               | 2 +-
 ppapi/thunk/ppb_instance_api.h                            | 6 +++---
 ppapi/thunk/ppb_uma_singleton_api.h                       | 6 +++---
 ppapi/thunk/ppb_url_loader_api.h                          | 6 +++---
 ppapi/thunk/ppb_url_request_info_api.h                    | 6 +++---
 ppapi/thunk/ppb_url_response_info_api.h                   | 2 +-
 ppapi/thunk/ppb_video_capture_api.h                       | 6 +++---
 ppapi/thunk/ppb_video_decoder_dev_api.h                   | 6 +++---
 ppapi/thunk/ppb_vpn_provider_api.h                        | 6 +++---
 ppapi/thunk/ppb_websocket_api.h                           | 6 +++---
 ppapi/utility/completion_callback_factory_thread_traits.h | 6 +++---
 ppapi/utility/graphics/paint_aggregator.h                 | 2 +-
 42 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/ppapi/tests/test_file_io.h b/ppapi/tests/test_file_io.h
index a0fb702e36f55..e1d4437173092 100644
--- a/ppapi/tests/test_file_io.h
+++ b/ppapi/tests/test_file_io.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_FILE_IO_H_
-#define PAPPI_TESTS_TEST_FILE_IO_H_
+#ifndef PPAPI_TESTS_TEST_FILE_IO_H_
+#define PPAPI_TESTS_TEST_FILE_IO_H_
 
 #include <stdint.h>
 
@@ -62,4 +62,4 @@ class TestFileIO : public TestCase {
                                     int32_t expectations);
 };
 
-#endif  // PAPPI_TESTS_TEST_FILE_IO_H_
+#endif  // PPAPI_TESTS_TEST_FILE_IO_H_
diff --git a/ppapi/tests/test_file_ref.h b/ppapi/tests/test_file_ref.h
index 3265698478597..dabbee204d817 100644
--- a/ppapi/tests/test_file_ref.h
+++ b/ppapi/tests/test_file_ref.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_FILE_REF_H_
-#define PAPPI_TESTS_TEST_FILE_REF_H_
+#ifndef PPAPI_TESTS_TEST_FILE_REF_H_
+#define PPAPI_TESTS_TEST_FILE_REF_H_
 
 #include <stdint.h>
 
@@ -44,4 +44,4 @@ class TestFileRef : public TestCase {
   std::string TestReadDirectoryEntries();
 };
 
-#endif  // PAPPI_TESTS_TEST_FILE_REF_H_
+#endif  // PPAPI_TESTS_TEST_FILE_REF_H_
diff --git a/ppapi/tests/test_file_system.h b/ppapi/tests/test_file_system.h
index de53e64c0dca6..1275e507a06e6 100644
--- a/ppapi/tests/test_file_system.h
+++ b/ppapi/tests/test_file_system.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_FILE_SYSTEM_H_
-#define PAPPI_TESTS_TEST_FILE_SYSTEM_H_
+#ifndef PPAPI_TESTS_TEST_FILE_SYSTEM_H_
+#define PPAPI_TESTS_TEST_FILE_SYSTEM_H_
 
 #include <string>
 
@@ -23,5 +23,5 @@ class TestFileSystem : public TestCase {
   std::string TestResourceConversion();
 };
 
-#endif  // PAPPI_TESTS_TEST_FILE_SYSTEM_H_
+#endif  // PPAPI_TESTS_TEST_FILE_SYSTEM_H_
 
diff --git a/ppapi/tests/test_fullscreen.h b/ppapi/tests/test_fullscreen.h
index 6324d3c4a5a76..39bf7f8b1dcb5 100644
--- a/ppapi/tests/test_fullscreen.h
+++ b/ppapi/tests/test_fullscreen.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_FULLSCREEN_H_
-#define PAPPI_TESTS_TEST_FULLSCREEN_H_
+#ifndef PPAPI_TESTS_TEST_FULLSCREEN_H_
+#define PPAPI_TESTS_TEST_FULLSCREEN_H_
 
 #include <stdint.h>
 
@@ -64,4 +64,4 @@ class TestFullscreen : public TestCase {
   NestedEvent normal_event_;
 };
 
-#endif  // PAPPI_TESTS_TEST_FULLSCREEN_H_
+#endif  // PPAPI_TESTS_TEST_FULLSCREEN_H_
diff --git a/ppapi/tests/test_graphics_3d.h b/ppapi/tests/test_graphics_3d.h
index ec456aedee80f..68a2cee9ad501 100644
--- a/ppapi/tests/test_graphics_3d.h
+++ b/ppapi/tests/test_graphics_3d.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_GRAPHICS_3D_H_
-#define PAPPI_TESTS_TEST_GRAPHICS_3D_H_
+#ifndef PPAPI_TESTS_TEST_GRAPHICS_3D_H_
+#define PPAPI_TESTS_TEST_GRAPHICS_3D_H_
 
 #include <stdint.h>
 
@@ -41,4 +41,4 @@ class TestGraphics3D : public TestCase {
   const PPB_OpenGLES2* opengl_es2_;
 };
 
-#endif  // PAPPI_TESTS_TEST_GRAPHICS_3D_H_
+#endif  // PPAPI_TESTS_TEST_GRAPHICS_3D_H_
diff --git a/ppapi/tests/test_instance_deprecated.h b/ppapi/tests/test_instance_deprecated.h
index c442c32ed8054..7fa3367c5663c 100644
--- a/ppapi/tests/test_instance_deprecated.h
+++ b/ppapi/tests/test_instance_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_TESTS_TEST_INSTANCE_H_
-#define PPAPI_TESTS_TEST_INSTANCE_H_
+#ifndef PPAPI_TESTS_TEST_INSTANCE_DEPRECATED_H_
+#define PPAPI_TESTS_TEST_INSTANCE_DEPRECATED_H_
 
 #include <string>
 #include <vector>
@@ -73,4 +73,4 @@ class TestInstance : public TestCase {
   InstanceSO* instance_so_;
 };
 
-#endif  // PPAPI_TESTS_TEST_INSTANCE_H_
+#endif  // PPAPI_TESTS_TEST_INSTANCE_DEPRECATED_H_
diff --git a/ppapi/tests/test_media_stream_video_track.h b/ppapi/tests/test_media_stream_video_track.h
index 6168a874f4efa..ed89af82a4523 100644
--- a/ppapi/tests/test_media_stream_video_track.h
+++ b/ppapi/tests/test_media_stream_video_track.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_MEDIA_STREAM_VIDEO_TRACK_H_
-#define PAPPI_TESTS_TEST_MEDIA_STREAM_VIDEO_TRACK_H_
+#ifndef PPAPI_TESTS_TEST_MEDIA_STREAM_VIDEO_TRACK_H_
+#define PPAPI_TESTS_TEST_MEDIA_STREAM_VIDEO_TRACK_H_
 
 #include <string>
 
@@ -32,4 +32,4 @@ class TestMediaStreamVideoTrack : public TestCase {
   NestedEvent event_;
 };
 
-#endif  // PAPPI_TESTS_TEST_MEDIA_STREAM_VIDEO_TRACK_H_
+#endif  // PPAPI_TESTS_TEST_MEDIA_STREAM_VIDEO_TRACK_H_
diff --git a/ppapi/tests/test_memory.h b/ppapi/tests/test_memory.h
index 896f1bd95d20c..830ff41ca5128 100644
--- a/ppapi/tests/test_memory.h
+++ b/ppapi/tests/test_memory.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_TEST_TEST_MEMORY_H_
-#define PPAPI_TEST_TEST_MEMORY_H_
+#ifndef PPAPI_TESTS_TEST_MEMORY_H_
+#define PPAPI_TESTS_TEST_MEMORY_H_
 
 #include <string>
 
@@ -26,4 +26,4 @@ class TestMemory : public TestCase {
   const PPB_Memory_Dev* memory_dev_interface_;
 };
 
-#endif  // PPAPI_TEST_TEST_VAR_H_
+#endif  // PPAPI_TESTS_TEST_MEMORY_H_
diff --git a/ppapi/tests/test_message_loop.h b/ppapi/tests/test_message_loop.h
index 0fb81ad44698d..847a9d8e13336 100644
--- a/ppapi/tests/test_message_loop.h
+++ b/ppapi/tests/test_message_loop.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_MESSAGE_LOOP_H_
-#define PAPPI_TESTS_TEST_MESSAGE_LOOP_H_
+#ifndef PPAPI_TESTS_TEST_MESSAGE_LOOP_H_
+#define PPAPI_TESTS_TEST_MESSAGE_LOOP_H_
 
 #include <string>
 
@@ -40,4 +40,4 @@ class TestMessageLoop : public TestCase {
   NestedEvent main_loop_task_ran_;
 };
 
-#endif  // PAPPI_TESTS_TEST_MESSAGE_LOOP_H_
+#endif  // PPAPI_TESTS_TEST_MESSAGE_LOOP_H_
diff --git a/ppapi/tests/test_nacl_irt_stack_alignment.h b/ppapi/tests/test_nacl_irt_stack_alignment.h
index 61de76f4d18d3..e78401916f63b 100644
--- a/ppapi/tests/test_nacl_irt_stack_alignment.h
+++ b/ppapi/tests/test_nacl_irt_stack_alignment.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_TEST_TEST_NACL_IRT_STACK_ALIGNMENT_H_
-#define PPAPI_TEST_TEST_NACL_IRT_STACK_ALIGNMENT_H_
+#ifndef PPAPI_TESTS_TEST_NACL_IRT_STACK_ALIGNMENT_H_
+#define PPAPI_TESTS_TEST_NACL_IRT_STACK_ALIGNMENT_H_
 
 #include <string>
 
@@ -27,4 +27,4 @@ class TestNaClIRTStackAlignment : public TestCase {
   const PPB_Var* var_interface_;
 };
 
-#endif  // PPAPI_TEST_TEST_NACL_IRT_STACK_ALIGNMENT_H_
+#endif  // PPAPI_TESTS_TEST_NACL_IRT_STACK_ALIGNMENT_H_
diff --git a/ppapi/tests/test_net_address.h b/ppapi/tests/test_net_address.h
index 6c6d470e1319b..e14cbf2557ae4 100644
--- a/ppapi/tests/test_net_address.h
+++ b/ppapi/tests/test_net_address.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_NET_ADDRESS_H_
-#define PAPPI_TESTS_TEST_NET_ADDRESS_H_
+#ifndef PPAPI_TESTS_TEST_NET_ADDRESS_H_
+#define PPAPI_TESTS_TEST_NET_ADDRESS_H_
 
 #include <string>
 
@@ -23,4 +23,4 @@ class TestNetAddress : public TestCase {
   std::string TestDescribeAsString();
 };
 
-#endif  // PAPPI_TESTS_TEST_NET_ADDRESS_H_
+#endif  // PPAPI_TESTS_TEST_NET_ADDRESS_H_
diff --git a/ppapi/tests/test_net_address_private.h b/ppapi/tests/test_net_address_private.h
index 0033df997b680..7977dc4ff206b 100644
--- a/ppapi/tests/test_net_address_private.h
+++ b/ppapi/tests/test_net_address_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 PAPPI_TESTS_TEST_NET_ADDRESS_PRIVATE_H_
-#define PAPPI_TESTS_TEST_NET_ADDRESS_PRIVATE_H_
+#ifndef PPAPI_TESTS_TEST_NET_ADDRESS_PRIVATE_H_
+#define PPAPI_TESTS_TEST_NET_ADDRESS_PRIVATE_H_
 
 #include <string>
 
@@ -30,4 +30,4 @@ class TestNetAddressPrivate : public TestCase {
   std::string TestGetScopeID();
 };
 
-#endif  // PAPPI_TESTS_TEST_NET_ADDRESS_PRIVATE_H_
+#endif  // PPAPI_TESTS_TEST_NET_ADDRESS_PRIVATE_H_
diff --git a/ppapi/tests/test_net_address_private_untrusted.h b/ppapi/tests/test_net_address_private_untrusted.h
index 2f47f94e25188..51453f3809887 100644
--- a/ppapi/tests/test_net_address_private_untrusted.h
+++ b/ppapi/tests/test_net_address_private_untrusted.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_NET_ADDRESS_PRIVATE_UNTRUSTED_H_
-#define PAPPI_TESTS_TEST_NET_ADDRESS_PRIVATE_UNTRUSTED_H_
+#ifndef PPAPI_TESTS_TEST_NET_ADDRESS_PRIVATE_UNTRUSTED_H_
+#define PPAPI_TESTS_TEST_NET_ADDRESS_PRIVATE_UNTRUSTED_H_
 
 #include <stdint.h>
 
@@ -43,4 +43,4 @@ class TestNetAddressPrivateUntrusted : public TestCase {
   uint16_t port_;
 };
 
-#endif  // PAPPI_TESTS_TEST_NET_ADDRESS_PRIVATE_UNTRUSTED_H_
+#endif  // PPAPI_TESTS_TEST_NET_ADDRESS_PRIVATE_UNTRUSTED_H_
diff --git a/ppapi/tests/test_network_monitor.h b/ppapi/tests/test_network_monitor.h
index 13745c87b6539..3d4ff7ad179cc 100644
--- a/ppapi/tests/test_network_monitor.h
+++ b/ppapi/tests/test_network_monitor.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_NETWORK_MONITOR_H_
-#define PAPPI_TESTS_TEST_NETWORK_MONITOR_H_
+#ifndef PPAPI_TESTS_TEST_NETWORK_MONITOR_H_
+#define PPAPI_TESTS_TEST_NETWORK_MONITOR_H_
 
 #include <string>
 
@@ -32,4 +32,4 @@ class TestNetworkMonitor : public TestCase {
 
 };
 
-#endif  // PAPPI_TESTS_TEST_NETWORK_MONITOR_H_
+#endif  // PPAPI_TESTS_TEST_NETWORK_MONITOR_H_
diff --git a/ppapi/tests/test_network_proxy.h b/ppapi/tests/test_network_proxy.h
index 4c072de0a735f..d76277e22e6bb 100644
--- a/ppapi/tests/test_network_proxy.h
+++ b/ppapi/tests/test_network_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 PAPPI_TESTS_TEST_NETWORK_PROXY_H_
-#define PAPPI_TESTS_TEST_NETWORK_PROXY_H_
+#ifndef PPAPI_TESTS_TEST_NETWORK_PROXY_H_
+#define PPAPI_TESTS_TEST_NETWORK_PROXY_H_
 
 #include <string>
 
@@ -20,4 +20,4 @@ class TestNetworkProxy : public TestCase {
   std::string TestGetProxyForURL();
 };
 
-#endif  // PAPPI_TESTS_TEST_NETWORK_PROXY_H_
+#endif  // PPAPI_TESTS_TEST_NETWORK_PROXY_H_
diff --git a/ppapi/tests/test_pdf.h b/ppapi/tests/test_pdf.h
index bdf4cc814c6d1..10effb9d5ed43 100644
--- a/ppapi/tests/test_pdf.h
+++ b/ppapi/tests/test_pdf.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_PDF_H_
-#define PAPPI_TESTS_TEST_PDF_H_
+#ifndef PPAPI_TESTS_TEST_PDF_H_
+#define PPAPI_TESTS_TEST_PDF_H_
 
 #include <string>
 
@@ -22,4 +22,4 @@ class TestPDF : public TestCase {
   std::string TestGetV8ExternalSnapshotData();
 };
 
-#endif  // PAPPI_TESTS_TEST_PDF_H_
+#endif  // PPAPI_TESTS_TEST_PDF_H_
diff --git a/ppapi/tests/test_tcp_socket.h b/ppapi/tests/test_tcp_socket.h
index 265f021b50ec7..d25834b77356a 100644
--- a/ppapi/tests/test_tcp_socket.h
+++ b/ppapi/tests/test_tcp_socket.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_TCP_SOCKET_H_
-#define PAPPI_TESTS_TEST_TCP_SOCKET_H_
+#ifndef PPAPI_TESTS_TEST_TCP_SOCKET_H_
+#define PPAPI_TESTS_TEST_TCP_SOCKET_H_
 
 #include <stddef.h>
 
@@ -104,4 +104,4 @@ class TestTCPSocket: public TestCase {
   const PPB_TCPSocket_1_0* socket_interface_1_0_;
 };
 
-#endif  // PAPPI_TESTS_TEST_TCP_SOCKET_H_
+#endif  // PPAPI_TESTS_TEST_TCP_SOCKET_H_
diff --git a/ppapi/tests/test_tcp_socket_private.h b/ppapi/tests/test_tcp_socket_private.h
index f76c62283b1aa..bfa1b6f8a116b 100644
--- a/ppapi/tests/test_tcp_socket_private.h
+++ b/ppapi/tests/test_tcp_socket_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 PAPPI_TESTS_TEST_TCP_SOCKET_PRIVATE_H_
-#define PAPPI_TESTS_TEST_TCP_SOCKET_PRIVATE_H_
+#ifndef PPAPI_TESTS_TEST_TCP_SOCKET_PRIVATE_H_
+#define PPAPI_TESTS_TEST_TCP_SOCKET_PRIVATE_H_
 
 #include <string>
 
@@ -48,4 +48,4 @@ class TestTCPSocketPrivate : public TestCase {
   uint16_t ssl_port_;
 };
 
-#endif  // PAPPI_TESTS_TEST_TCP_SOCKET_PRIVATE_H_
+#endif  // PPAPI_TESTS_TEST_TCP_SOCKET_PRIVATE_H_
diff --git a/ppapi/tests/test_tcp_socket_private_trusted.h b/ppapi/tests/test_tcp_socket_private_trusted.h
index 364229a9fc77f..2b5cfa48586ab 100644
--- a/ppapi/tests/test_tcp_socket_private_trusted.h
+++ b/ppapi/tests/test_tcp_socket_private_trusted.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_TCP_SOCKET_PRIVATE_TRUSTED_H_
-#define PAPPI_TESTS_TEST_TCP_SOCKET_PRIVATE_TRUSTED_H_
+#ifndef PPAPI_TESTS_TEST_TCP_SOCKET_PRIVATE_TRUSTED_H_
+#define PPAPI_TESTS_TEST_TCP_SOCKET_PRIVATE_TRUSTED_H_
 
 #include <string>
 
@@ -29,4 +29,4 @@ class TestTCPSocketPrivateTrusted : public TestCase {
   uint16_t ssl_port_;
 };
 
-#endif  // PAPPI_TESTS_TEST_TCP_SOCKET_PRIVATE_TRUSTED_H_
+#endif  // PPAPI_TESTS_TEST_TCP_SOCKET_PRIVATE_TRUSTED_H_
diff --git a/ppapi/tests/test_uma.h b/ppapi/tests/test_uma.h
index 81fe99095b3db..c7bc706782a32 100644
--- a/ppapi/tests/test_uma.h
+++ b/ppapi/tests/test_uma.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_UMA_H_
-#define PAPPI_TESTS_TEST_UMA_H_
+#ifndef PPAPI_TESTS_TEST_UMA_H_
+#define PPAPI_TESTS_TEST_UMA_H_
 
 #include <string>
 
@@ -27,4 +27,4 @@ class TestUMA : public TestCase {
   const PPB_UMA_Private* uma_interface_;
 };
 
-#endif  // PAPPI_TESTS_TEST_UMA_H_
+#endif  // PPAPI_TESTS_TEST_UMA_H_
diff --git a/ppapi/tests/test_url_request.h b/ppapi/tests/test_url_request.h
index 22d89d09a10db..fa240908ac258 100644
--- a/ppapi/tests/test_url_request.h
+++ b/ppapi/tests/test_url_request.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_URL_REQUEST_H_
-#define PAPPI_TESTS_TEST_URL_REQUEST_H_
+#ifndef PPAPI_TESTS_TEST_URL_REQUEST_H_
+#define PPAPI_TESTS_TEST_URL_REQUEST_H_
 
 #include <string>
 
@@ -41,4 +41,4 @@ class TestURLRequest : public TestCase {
   const PPB_Var* ppb_var_interface_;
 };
 
-#endif  // PAPPI_TESTS_TEST_URL_REQUEST_H_
+#endif  // PPAPI_TESTS_TEST_URL_REQUEST_H_
diff --git a/ppapi/tests/test_var.h b/ppapi/tests/test_var.h
index 62cb62292a252..6f92a04dbe5b3 100644
--- a/ppapi/tests/test_var.h
+++ b/ppapi/tests/test_var.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_TEST_TEST_VAR_H_
-#define PPAPI_TEST_TEST_VAR_H_
+#ifndef PPAPI_TESTS_TEST_VAR_H_
+#define PPAPI_TESTS_TEST_VAR_H_
 
 #include <string>
 
@@ -33,4 +33,4 @@ class TestVar : public TestCase {
   const PPB_Var* var_interface_;
 };
 
-#endif  // PPAPI_TEST_TEST_VAR_H_
+#endif  // PPAPI_TESTS_TEST_VAR_H_
diff --git a/ppapi/tests/test_var_deprecated.h b/ppapi/tests/test_var_deprecated.h
index 26180a61098ef..b8395baf15d88 100644
--- a/ppapi/tests/test_var_deprecated.h
+++ b/ppapi/tests/test_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_TEST_TEST_VAR_DEPRECATED_H_
-#define PPAPI_TEST_TEST_VAR_DEPRECATED_H_
+#ifndef PPAPI_TESTS_TEST_VAR_DEPRECATED_H_
+#define PPAPI_TESTS_TEST_VAR_DEPRECATED_H_
 
 #include <string>
 
@@ -43,4 +43,4 @@ class TestVarDeprecated : public TestCase {
   pp::VarPrivate var_from_page_;
 };
 
-#endif  // PPAPI_TEST_TEST_VAR_DEPRECATED_H_
+#endif  // PPAPI_TESTS_TEST_VAR_DEPRECATED_H_
diff --git a/ppapi/tests/test_var_resource.h b/ppapi/tests/test_var_resource.h
index 66b211ee38df4..4f5c8e1991502 100644
--- a/ppapi/tests/test_var_resource.h
+++ b/ppapi/tests/test_var_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_TEST_TEST_VAR_RESOURCE_H_
-#define PPAPI_TEST_TEST_VAR_RESOURCE_H_
+#ifndef PPAPI_TESTS_TEST_VAR_RESOURCE_H_
+#define PPAPI_TESTS_TEST_VAR_RESOURCE_H_
 
 #include <string>
 
@@ -30,4 +30,4 @@ class TestVarResource : public TestCase {
   const PPB_Var* var_interface_;
 };
 
-#endif  // PPAPI_TEST_TEST_VAR_RESOURCE_H_
+#endif  // PPAPI_TESTS_TEST_VAR_RESOURCE_H_
diff --git a/ppapi/tests/test_view.h b/ppapi/tests/test_view.h
index 6d4d2d666aa6f..f6349638ee23d 100644
--- a/ppapi/tests/test_view.h
+++ b/ppapi/tests/test_view.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_TEST_TEST_VIEW_H_
-#define PPAPI_TEST_TEST_VIEW_H_
+#ifndef PPAPI_TESTS_TEST_VIEW_H_
+#define PPAPI_TESTS_TEST_VIEW_H_
 
 #include <stdint.h>
 
@@ -51,4 +51,4 @@ class TestView : public TestCase {
   bool post_quit_on_view_changed_;
 };
 
-#endif  // PPAPI_TEST_TEST_VIEW_H_
+#endif  // PPAPI_TESTS_TEST_VIEW_H_
diff --git a/ppapi/tests/test_x509_certificate_private.h b/ppapi/tests/test_x509_certificate_private.h
index 0b3da9981e2ab..eb3e14bade12a 100644
--- a/ppapi/tests/test_x509_certificate_private.h
+++ b/ppapi/tests/test_x509_certificate_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 PPAPPI_TESTS_TEST_X509_CERTIFICATE_PRIVATE_H_
-#define PPAPPI_TESTS_TEST_X509_CERTIFICATE_PRIVATE_H_
+#ifndef PPAPI_TESTS_TEST_X509_CERTIFICATE_PRIVATE_H_
+#define PPAPI_TESTS_TEST_X509_CERTIFICATE_PRIVATE_H_
 
 #include <string>
 
@@ -22,4 +22,4 @@ class TestX509CertificatePrivate : public TestCase {
   std::string TestInvalidCertificate();
 };
 
-#endif  // PPAPPI_TESTS_TEST_X509_CERTIFICATE_PRIVATE_H_
+#endif  // PPAPI_TESTS_TEST_X509_CERTIFICATE_PRIVATE_H_
diff --git a/ppapi/thunk/ppb_audio_config_api.h b/ppapi/thunk/ppb_audio_config_api.h
index 5faa6c468fcec..222089220938d 100644
--- a/ppapi/thunk/ppb_audio_config_api.h
+++ b/ppapi/thunk/ppb_audio_config_api.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_THUNK_AUDIO_CONFIG_API_H_
-#define PPAPI_THUNK_AUDIO_CONFIG_API_H_
+#ifndef PPAPI_THUNK_PPB_AUDIO_CONFIG_API_H_
+#define PPAPI_THUNK_PPB_AUDIO_CONFIG_API_H_
 
 #include <stdint.h>
 
@@ -24,4 +24,4 @@ class PPAPI_THUNK_EXPORT PPB_AudioConfig_API {
 }  // namespace thunk
 }  // namespace ppapi
 
-#endif  // PPAPI_THUNK_AUDIO_CONFIG_API_H_
+#endif  // PPAPI_THUNK_PPB_AUDIO_CONFIG_API_H_
diff --git a/ppapi/thunk/ppb_audio_input_api.h b/ppapi/thunk/ppb_audio_input_api.h
index ee0aa3a0dd6b2..4cdded086f464 100644
--- a/ppapi/thunk/ppb_audio_input_api.h
+++ b/ppapi/thunk/ppb_audio_input_api.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_THUNK_AUDIO_INPUT_API_H_
-#define PPAPI_THUNK_AUDIO_INPUT_API_H_
+#ifndef PPAPI_THUNK_PPB_AUDIO_INPUT_API_H_
+#define PPAPI_THUNK_PPB_AUDIO_INPUT_API_H_
 
 #include <stdint.h>
 
@@ -43,4 +43,4 @@ class PPB_AudioInput_API {
 }  // namespace thunk
 }  // namespace ppapi
 
-#endif  // PPAPI_THUNK_AUDIO_INPUT_API_H_
+#endif  // PPAPI_THUNK_PPB_AUDIO_INPUT_API_H_
diff --git a/ppapi/thunk/ppb_audio_output_api.h b/ppapi/thunk/ppb_audio_output_api.h
index ea8d7e52bed7d..3779ee5c8585d 100644
--- a/ppapi/thunk/ppb_audio_output_api.h
+++ b/ppapi/thunk/ppb_audio_output_api.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_THUNK_AUDIO_OUTPUT_API_H_
-#define PPAPI_THUNK_AUDIO_OUTPUT_API_H_
+#ifndef PPAPI_THUNK_PPB_AUDIO_OUTPUT_API_H_
+#define PPAPI_THUNK_PPB_AUDIO_OUTPUT_API_H_
 
 #include <stdint.h>
 
@@ -38,4 +38,4 @@ class PPB_AudioOutput_API {
 }  // namespace thunk
 }  // namespace ppapi
 
-#endif  // PPAPI_THUNK_AUDIO_OUTPUT_API_H_
+#endif  // PPAPI_THUNK_PPB_AUDIO_OUTPUT_API_H_
diff --git a/ppapi/thunk/ppb_host_resolver_api.h b/ppapi/thunk/ppb_host_resolver_api.h
index c64b05bc3dcc1..01832b8c87760 100644
--- a/ppapi/thunk/ppb_host_resolver_api.h
+++ b/ppapi/thunk/ppb_host_resolver_api.h
@@ -33,4 +33,4 @@ class PPAPI_THUNK_EXPORT PPB_HostResolver_API {
 }  // namespace thunk
 }  // namespace ppapi
 
-#endif  // PPAPI_THUNK_PPB_TCP_SOCKET_API_H_
+#endif  // PPAPI_THUNK_PPB_HOST_RESOLVER_API_H_
diff --git a/ppapi/thunk/ppb_host_resolver_private_api.h b/ppapi/thunk/ppb_host_resolver_private_api.h
index 92e0ac7a3de24..1e44475c6d072 100644
--- a/ppapi/thunk/ppb_host_resolver_private_api.h
+++ b/ppapi/thunk/ppb_host_resolver_private_api.h
@@ -34,4 +34,4 @@ class PPAPI_THUNK_EXPORT PPB_HostResolver_Private_API {
 }  // namespace thunk
 }  // namespace ppapi
 
-#endif  // PPAPI_THUNK_PPB_TCP_SOCKET_PRIVATE_API_H_
+#endif  // PPAPI_THUNK_PPB_HOST_RESOLVER_PRIVATE_API_H_
diff --git a/ppapi/thunk/ppb_instance_api.h b/ppapi/thunk/ppb_instance_api.h
index 520cb3c006551..7b8c6b27c2142 100644
--- a/ppapi/thunk/ppb_instance_api.h
+++ b/ppapi/thunk/ppb_instance_api.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_THUNK_INSTANCE_API_H_
-#define PPAPI_THUNK_INSTANCE_API_H_
+#ifndef PPAPI_THUNK_PPB_INSTANCE_API_H_
+#define PPAPI_THUNK_PPB_INSTANCE_API_H_
 
 #include <stdint.h>
 
@@ -162,4 +162,4 @@ class PPB_Instance_API {
 }  // namespace thunk
 }  // namespace ppapi
 
-#endif  // PPAPI_THUNK_INSTANCE_API_H_
+#endif  // PPAPI_THUNK_PPB_INSTANCE_API_H_
diff --git a/ppapi/thunk/ppb_uma_singleton_api.h b/ppapi/thunk/ppb_uma_singleton_api.h
index 86e1976c8630e..bb9d0ad69c6cf 100644
--- a/ppapi/thunk/ppb_uma_singleton_api.h
+++ b/ppapi/thunk/ppb_uma_singleton_api.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_THUNK_PPB_UMA_PRIVATE_API_H_
-#define PPAPI_THUNK_PPB_UMA_PRIVATE_API_H_
+#ifndef PPAPI_THUNK_PPB_UMA_SINGLETON_API_H_
+#define PPAPI_THUNK_PPB_UMA_SINGLETON_API_H_
 
 #include <stdint.h>
 
@@ -46,4 +46,4 @@ class PPAPI_THUNK_EXPORT PPB_UMA_Singleton_API {
 }  // namespace thunk
 }  // namespace ppapi
 
-#endif  // PPAPI_THUNK_PPB_UMA_PRIVATE_API_H_
+#endif  // PPAPI_THUNK_PPB_UMA_SINGLETON_API_H_
diff --git a/ppapi/thunk/ppb_url_loader_api.h b/ppapi/thunk/ppb_url_loader_api.h
index 27163b662e966..33eb97e5b5043 100644
--- a/ppapi/thunk/ppb_url_loader_api.h
+++ b/ppapi/thunk/ppb_url_loader_api.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_THUNK_URL_LOADER_API_H_
-#define PPAPI_THUNK_URL_LOADER_API_H_
+#ifndef PPAPI_THUNK_PPB_URL_LOADER_API_H_
+#define PPAPI_THUNK_PPB_URL_LOADER_API_H_
 
 #include <stdint.h>
 
@@ -55,4 +55,4 @@ class PPB_URLLoader_API {
 }  // namespace thunk
 }  // namespace ppapi
 
-#endif  // PPAPI_THUNK_URL_LOADER_API_H_
+#endif  // PPAPI_THUNK_PPB_URL_LOADER_API_H_
diff --git a/ppapi/thunk/ppb_url_request_info_api.h b/ppapi/thunk/ppb_url_request_info_api.h
index 0e22aec785989..64e26840859f0 100644
--- a/ppapi/thunk/ppb_url_request_info_api.h
+++ b/ppapi/thunk/ppb_url_request_info_api.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_THUNK_URL_REQUEST_INFO_API_H_
-#define PPAPI_THUNK_URL_REQUEST_INFO_API_H_
+#ifndef PPAPI_THUNK_PPB_URL_REQUEST_INFO_API_H_
+#define PPAPI_THUNK_PPB_URL_REQUEST_INFO_API_H_
 
 #include <stdint.h>
 
@@ -35,4 +35,4 @@ class PPAPI_THUNK_EXPORT PPB_URLRequestInfo_API {
 }  // namespace thunk
 }  // namespace ppapi
 
-#endif  // PPAPI_THUNK_URL_REQUEST_INFO_API_H_
+#endif  // PPAPI_THUNK_PPB_URL_REQUEST_INFO_API_H_
diff --git a/ppapi/thunk/ppb_url_response_info_api.h b/ppapi/thunk/ppb_url_response_info_api.h
index 5fea9a39c7970..cb4f74fcceebe 100644
--- a/ppapi/thunk/ppb_url_response_info_api.h
+++ b/ppapi/thunk/ppb_url_response_info_api.h
@@ -22,4 +22,4 @@ class PPB_URLResponseInfo_API {
 }  // namespace thunk
 }  // namespace ppapi
 
-#endif  // PPAPI_THUNK_URL_LOADER_API_H_
+#endif  // PPAPI_THUNK_PPB_URL_RESPONSE_INFO_API_H_
diff --git a/ppapi/thunk/ppb_video_capture_api.h b/ppapi/thunk/ppb_video_capture_api.h
index 911c8557f6a35..f7f20f397c5b0 100644
--- a/ppapi/thunk/ppb_video_capture_api.h
+++ b/ppapi/thunk/ppb_video_capture_api.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_THUNK_VIDEO_CAPTURE_API_H_
-#define PPAPI_THUNK_VIDEO_CAPTURE_API_H_
+#ifndef PPAPI_THUNK_PPB_VIDEO_CAPTURE_API_H_
+#define PPAPI_THUNK_PPB_VIDEO_CAPTURE_API_H_
 
 #include <stdint.h>
 
@@ -46,4 +46,4 @@ class PPB_VideoCapture_API {
 }  // namespace thunk
 }  // namespace ppapi
 
-#endif  // PPAPI_THUNK_VIDEO_CAPTURE_API_H_
+#endif  // PPAPI_THUNK_PPB_VIDEO_CAPTURE_API_H_
diff --git a/ppapi/thunk/ppb_video_decoder_dev_api.h b/ppapi/thunk/ppb_video_decoder_dev_api.h
index 1ddf0fde34fbf..62bee4e721e36 100644
--- a/ppapi/thunk/ppb_video_decoder_dev_api.h
+++ b/ppapi/thunk/ppb_video_decoder_dev_api.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_THUNK_VIDEO_DECODER_DEV_API_H_
-#define PPAPI_THUNK_VIDEO_DECODER_DEV_API_H_
+#ifndef PPAPI_THUNK_PPB_VIDEO_DECODER_DEV_API_H_
+#define PPAPI_THUNK_PPB_VIDEO_DECODER_DEV_API_H_
 
 #include <stdint.h>
 
@@ -33,4 +33,4 @@ class PPB_VideoDecoder_Dev_API {
 }  // namespace thunk
 }  // namespace ppapi
 
-#endif  // PPAPI_THUNK_VIDEO_DECODER_DEV_API_H_
+#endif  // PPAPI_THUNK_PPB_VIDEO_DECODER_DEV_API_H_
diff --git a/ppapi/thunk/ppb_vpn_provider_api.h b/ppapi/thunk/ppb_vpn_provider_api.h
index 7153afb02c651..2d890baf3793a 100644
--- a/ppapi/thunk/ppb_vpn_provider_api.h
+++ b/ppapi/thunk/ppb_vpn_provider_api.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_THUNK_PPB_VPNPROVIDER_API_H_
-#define PPAPI_THUNK_PPB_VPNPROVIDER_API_H_
+#ifndef PPAPI_THUNK_PPB_VPN_PROVIDER_API_H_
+#define PPAPI_THUNK_PPB_VPN_PROVIDER_API_H_
 
 #include "ppapi/thunk/ppapi_thunk_export.h"
 
@@ -28,4 +28,4 @@ class PPAPI_THUNK_EXPORT PPB_VpnProvider_API {
 }  // namespace thunk
 }  // namespace ppapi
 
-#endif  // PPAPI_THUNK_PPB_VPNPROVIDER_API_H_
+#endif  // PPAPI_THUNK_PPB_VPN_PROVIDER_API_H_
diff --git a/ppapi/thunk/ppb_websocket_api.h b/ppapi/thunk/ppb_websocket_api.h
index f0e3e6a601587..30ec165cca7ef 100644
--- a/ppapi/thunk/ppb_websocket_api.h
+++ b/ppapi/thunk/ppb_websocket_api.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_THUNK_WEBSOCKET_API_H_
-#define PPAPI_THUNK_WEBSOCKET_API_H_
+#ifndef PPAPI_THUNK_PPB_WEBSOCKET_API_H_
+#define PPAPI_THUNK_PPB_WEBSOCKET_API_H_
 
 #include <stdint.h>
 
@@ -83,4 +83,4 @@ class PPAPI_THUNK_EXPORT PPB_WebSocket_API {
 }  // namespace thunk
 }  // namespace ppapi
 
-#endif  // PPAPI_THUNK_WEBSOCKET_API_H_
+#endif  // PPAPI_THUNK_PPB_WEBSOCKET_API_H_
diff --git a/ppapi/utility/completion_callback_factory_thread_traits.h b/ppapi/utility/completion_callback_factory_thread_traits.h
index ac0b31a75c2fe..b4fdb9a6d39f7 100644
--- a/ppapi/utility/completion_callback_factory_thread_traits.h
+++ b/ppapi/utility/completion_callback_factory_thread_traits.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_UTILITY_THREAD_SAFE_THREAD_TRAITS_H_
-#define PPAPI_UTILITY_THREAD_SAFE_THREAD_TRAITS_H_
+#ifndef PPAPI_UTILITY_COMPLETION_CALLBACK_FACTORY_THREAD_TRAITS_H_
+#define PPAPI_UTILITY_COMPLETION_CALLBACK_FACTORY_THREAD_TRAITS_H_
 
 #include <stdint.h>
 
@@ -177,4 +177,4 @@ class NonThreadSafeThreadTraits {
 
 }  // namespace pp
 
-#endif  // PPAPI_UTILITY_THREAD_SAFE_THREAD_TRAITS_H_
+#endif  // PPAPI_UTILITY_COMPLETION_CALLBACK_FACTORY_THREAD_TRAITS_H_
diff --git a/ppapi/utility/graphics/paint_aggregator.h b/ppapi/utility/graphics/paint_aggregator.h
index ba214de4d9184..07a35b31bdb43 100644
--- a/ppapi/utility/graphics/paint_aggregator.h
+++ b/ppapi/utility/graphics/paint_aggregator.h
@@ -171,4 +171,4 @@ class PaintAggregator {
 
 }  // namespace pp
 
-#endif  // PPAPI_UTILITY_PAINT_AGGREGATOR_H_
+#endif  // PPAPI_UTILITY_GRAPHICS_PAINT_AGGREGATOR_H_