Index: gpu/command_buffer/service/gles2_cmd_decoder.cc |
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc |
index 5cfe24869810a68dcf260580b0f617ae4cf03ede..2363e5346ee01712513a0217ae6e0ece0652a12c 100644 |
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc |
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc |
@@ -22,14 +22,16 @@ |
#include "base/mac/scoped_cftyperef.h" |
#endif |
#include "base/memory/scoped_ptr.h" |
-#include "base/string_number_conversions.h" |
+#include "base/strings/string_number_conversions.h" |
#include "build/build_config.h" |
#define GLES2_GPU_SERVICE 1 |
+#include "gpu/command_buffer/common/debug_marker_manager.h" |
#include "gpu/command_buffer/common/gles2_cmd_format.h" |
#include "gpu/command_buffer/common/gles2_cmd_utils.h" |
-#include "gpu/command_buffer/common/debug_marker_manager.h" |
#include "gpu/command_buffer/common/id_allocator.h" |
#include "gpu/command_buffer/common/mailbox.h" |
+#include "gpu/command_buffer/service/async_pixel_transfer_delegate.h" |
+#include "gpu/command_buffer/service/async_pixel_transfer_manager.h" |
#include "gpu/command_buffer/service/buffer_manager.h" |
#include "gpu/command_buffer/service/cmd_buffer_engine.h" |
#include "gpu/command_buffer/service/context_group.h" |
@@ -54,10 +56,8 @@ |
#include "gpu/command_buffer/service/stream_texture.h" |
#include "gpu/command_buffer/service/stream_texture_manager.h" |
#include "gpu/command_buffer/service/texture_manager.h" |
-#include "gpu/command_buffer/service/vertex_attrib_manager.h" |
#include "gpu/command_buffer/service/vertex_array_manager.h" |
-#include "gpu/command_buffer/service/async_pixel_transfer_delegate.h" |
-#include "gpu/command_buffer/service/async_pixel_transfer_manager.h" |
+#include "gpu/command_buffer/service/vertex_attrib_manager.h" |
#include "ui/gl/gl_bindings.h" |
#include "ui/gl/gl_image.h" |
#include "ui/gl/gl_implementation.h" |