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

content/common/resource_messages.h

Index: content/common/resource_messages.h
diff --git a/content/common/resource_messages.h b/content/common/resource_messages.h
index 885adb0d3a05aa80200bc74c81a80e54d379f6f0..294b7b9b19a0b40e626ae04f31f0e718969ef2e5 100644
--- a/content/common/resource_messages.h
+++ b/content/common/resource_messages.h
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef CONTENT_COMMON_RESOURCE_MESSAGES_H_
+#define CONTENT_COMMON_RESOURCE_MESSAGES_H_
+
 // IPC messages for resource loading.
 //
 // NOTE: All messages must send an |int request_id| as their first parameter.
 
-// Multiply-included message file, hence no include guard.
-
 #include <stdint.h>
 
 #include "base/memory/shared_memory.h"
@@ -31,8 +32,8 @@
 #include "net/url_request/redirect_info.h"
 #include "third_party/WebKit/public/platform/WebMixedContentContextType.h"
 
-#ifndef CONTENT_COMMON_RESOURCE_MESSAGES_H_
-#define CONTENT_COMMON_RESOURCE_MESSAGES_H_
+#ifndef INTERNAL_CONTENT_COMMON_RESOURCE_MESSAGES_H_
+#define INTERNAL_CONTENT_COMMON_RESOURCE_MESSAGES_H_
 
 namespace net {
 struct LoadTimingInfo;
@@ -134,7 +135,7 @@ struct ParamTraits<scoped_refptr<net::ct::SignedCertificateTimestamp>> {
 
 }  // namespace IPC
 
-#endif  // CONTENT_COMMON_RESOURCE_MESSAGES_H_
+#endif  // INTERNAL_CONTENT_COMMON_RESOURCE_MESSAGES_H_
 
 
 #define IPC_MESSAGE_START ResourceMsgStart
@@ -415,3 +416,5 @@ IPC_MESSAGE_CONTROL3(ResourceHostMsg_DidChangePriority,
                      int /* request_id */,
                      net::RequestPriority,
                      int /* intra_priority_value */)
+
+#endif  // CONTENT_COMMON_RESOURCE_MESSAGES_H_