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

content/common/platform_notification_messages.h

Index: content/common/platform_notification_messages.h
diff --git a/content/common/platform_notification_messages.h b/content/common/platform_notification_messages.h
index 02bb9f3af973da03cc726ee9bb139ced31e5efd8..cb37f10f44968c00bb86d1b64e637f0255939baa 100644
--- a/content/common/platform_notification_messages.h
+++ b/content/common/platform_notification_messages.h
@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef CONTENT_COMMON_PLATFORM_NOTIFICATION_MESSAGES_H_
+#define CONTENT_COMMON_PLATFORM_NOTIFICATION_MESSAGES_H_
+
 // Messages for platform-native notifications using the Web Notification API.
-// Multiply-included message file, hence no include guard.
 
 #include <stdint.h>
 #include <string>
@@ -16,15 +18,15 @@
 #include "ipc/ipc_message_macros.h"
 
 // Singly-included section for type definitions.
-#ifndef CONTENT_COMMON_PLATFORM_NOTIFICATION_MESSAGES_H_
-#define CONTENT_COMMON_PLATFORM_NOTIFICATION_MESSAGES_H_
+#ifndef INTERNAL_CONTENT_COMMON_PLATFORM_NOTIFICATION_MESSAGES_H_
+#define INTERNAL_CONTENT_COMMON_PLATFORM_NOTIFICATION_MESSAGES_H_
 
 // Defines the pair of [notification id] => [notification data] used when
 // getting the notifications for a given Service Worker registration.
 using PersistentNotificationInfo =
     std::pair<std::string, content::PlatformNotificationData>;
 
-#endif  // CONTENT_COMMON_PLATFORM_NOTIFICATION_MESSAGES_H_
+#endif  // INTERNAL_CONTENT_COMMON_PLATFORM_NOTIFICATION_MESSAGES_H_
 
 #define IPC_MESSAGE_START PlatformNotificationMsgStart
 
@@ -128,3 +130,5 @@ IPC_MESSAGE_CONTROL3(PlatformNotificationHostMsg_ClosePersistent,
                      GURL /* origin */,
                      std::string /* tag */,
                      std::string /* notification_id */)
+
+#endif  // CONTENT_COMMON_PLATFORM_NOTIFICATION_MESSAGES_H_