Snapshot of all changes to get jumbo in blink and content.

content/common/android/sync_compositor_messages.h

Index: content/common/android/sync_compositor_messages.h
diff --git a/content/common/android/sync_compositor_messages.h b/content/common/android/sync_compositor_messages.h
index 346c6e4aa747e0c48002de9259a0874b37c9ff56..a0f40cd22d23ef16f05b8978ccba7eedcb15f9e6 100644
--- a/content/common/android/sync_compositor_messages.h
+++ b/content/common/android/sync_compositor_messages.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef CONTENT_COMMON_ANDROID_SYNC_COMPOSITOR_MESSAGES_H_
+#define CONTENT_COMMON_ANDROID_SYNC_COMPOSITOR_MESSAGES_H_
+
 #include <stddef.h>
 
 #include "base/memory/shared_memory_handle.h"
@@ -16,8 +19,8 @@
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/scroll_offset.h"
 
-#ifndef CONTENT_COMMON_ANDROID_SYNC_COMPOSITOR_MESSAGES_H_
-#define CONTENT_COMMON_ANDROID_SYNC_COMPOSITOR_MESSAGES_H_
+#ifndef INTERNAL_CONTENT_COMMON_ANDROID_SYNC_COMPOSITOR_MESSAGES_H_
+#define INTERNAL_CONTENT_COMMON_ANDROID_SYNC_COMPOSITOR_MESSAGES_H_
 
 namespace content {
 
@@ -75,7 +78,7 @@ struct SyncCompositorCommonRendererParams {
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_ANDROID_SYNC_COMPOSITOR_MESSAGES_H_
+#endif  // INTERNAL_CONTENT_COMMON_ANDROID_SYNC_COMPOSITOR_MESSAGES_H_
 
 // Multiply-included message file, hence no include guard.
 
@@ -171,3 +174,5 @@ IPC_MESSAGE_ROUTED1(SyncCompositorHostMsg_UpdateState,
 IPC_MESSAGE_ROUTED2(SyncCompositorHostMsg_ReturnFrame,
                     uint32_t /* layer_tree_frame_sink_id */,
                     base::Optional<cc::CompositorFrame>);
+
+#endif  // CONTENT_COMMON_ANDROID_SYNC_COMPOSITOR_MESSAGES_H_