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

content/common/dwrite_font_proxy_messages.h

 // Copyright 2015 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_DWRITE_FONT_PROXY_MESSAGES_H_
+#define CONTENT_COMMON_DWRITE_FONT_PROXY_MESSAGES_H_
+
 #include <stdint.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "content/common/content_export.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 #define IPC_MESSAGE_START DWriteFontProxyMsgStart
 
-#ifndef CONTENT_COMMON_DWRITE_FONT_PROXY_MESSAGES_H_
-#define CONTENT_COMMON_DWRITE_FONT_PROXY_MESSAGES_H_
+#ifndef INTERNAL_CONTENT_COMMON_DWRITE_FONT_PROXY_MESSAGES_H_
+#define INTERNAL_CONTENT_COMMON_DWRITE_FONT_PROXY_MESSAGES_H_
 
 // The macros can't handle a complex template declaration, so we typedef it.
 typedef std::pair<base::string16, base::string16> DWriteStringPair;
 
-#endif  // CONTENT_COMMON_DWRITE_FONT_PROXY_MESSAGES_H_
+#endif  // INTERNAL_CONTENT_COMMON_DWRITE_FONT_PROXY_MESSAGES_H_
 
 IPC_STRUCT_BEGIN(DWriteFontStyle)
   IPC_STRUCT_MEMBER(uint16_t, font_weight)
   IPC_STRUCT_MEMBER(uint8_t, font_slant)
   IPC_STRUCT_MEMBER(uint8_t, font_stretch)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(MapCharactersResult)
   IPC_STRUCT_MEMBER(uint32_t, family_index)
   IPC_STRUCT_MEMBER(base::string16, family_name)
@@ skipping 33 matching lines @@
 // rendered. If no font exists that can render the text, family_index will be
 // UINT32_MAX and mapped_length will indicate how many characters cannot be
 // rendered by any installed font.
 IPC_SYNC_MESSAGE_CONTROL5_1(DWriteFontProxyMsg_MapCharacters,
                             base::string16 /* text */,
                             DWriteFontStyle /* font_style */,
                             base::string16 /* locale_name */,
                             uint32_t /* reading_direction */,
                             base::string16 /* base_family_name - optional */,
                             MapCharactersResult /* out */)
+
+#endif  // CONTENT_COMMON_DWRITE_FONT_PROXY_MESSAGES_H_