commit 9ab5563a3196760eb381d102cbb2bc0f7abc6a50
author Ben Murdoch <benm@google.com> Thu Jul 18 11:57:30 2013 +0100
committer Ben Murdoch <benm@google.com> Thu Jul 18 11:57:30 2013 +0100
tree 1c690f8b0c998ba536a0c7aeff34764383c7dff6
parent 106cdaa9e420b49e5b1ef6941f08dd990128a374

Merge from Chromium at DEPS revision r212225

This commit was generated by merge_to_master.py.

Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c

ppapi/proxy/ppapi_messages.h

diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index 8335415..b8e7456 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -8,8 +8,8 @@
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
+#include "base/memory/shared_memory.h"
 #include "base/process.h"
-#include "base/shared_memory.h"
 #include "base/strings/string16.h"
 #include "base/sync_socket.h"
 #include "base/values.h"
@@ -44,8 +44,8 @@
 #include "ppapi/c/private/ppb_host_resolver_private.h"
 #include "ppapi/c/private/ppb_net_address_private.h"
 #include "ppapi/c/private/ppb_pdf.h"
-#include "ppapi/c/private/ppp_flash_browser_operations.h"
 #include "ppapi/c/private/ppb_talk_private.h"
+#include "ppapi/c/private/ppp_flash_browser_operations.h"
 #include "ppapi/proxy/host_resolver_private_resource.h"
 #include "ppapi/proxy/ppapi_param_traits.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"