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

content/common/platform_notification_messages.h

 // Copyright 2014 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.
 
+#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>
 #include <utility>
 #include <vector>
 
 #include "content/public/common/common_param_traits_macros.h"
 #include "content/public/common/notification_resources.h"
 #include "content/public/common/platform_notification_data.h"
 #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
 
 IPC_ENUM_TRAITS_MAX_VALUE(
     content::PlatformNotificationData::Direction,
     content::PlatformNotificationData::DIRECTION_LAST)
 
 IPC_ENUM_TRAITS_MAX_VALUE(content::PlatformNotificationActionType,
                           content::PLATFORM_NOTIFICATION_ACTION_TYPE_TEXT)
 
@@ skipping 83 matching lines @@
 
 IPC_MESSAGE_CONTROL3(PlatformNotificationHostMsg_Close,
                      GURL /* origin */,
                      std::string /* tag */,
                      int /* non_persistent_notification_id */)
 
 IPC_MESSAGE_CONTROL3(PlatformNotificationHostMsg_ClosePersistent,
                      GURL /* origin */,
                      std::string /* tag */,
                      std::string /* notification_id */)
+
+#endif  // CONTENT_COMMON_PLATFORM_NOTIFICATION_MESSAGES_H_