Switch to standard integer types in media/.

media/renderers/skcanvas_video_renderer.cc

Index: media/renderers/skcanvas_video_renderer.cc
diff --git a/media/renderers/skcanvas_video_renderer.cc b/media/renderers/skcanvas_video_renderer.cc
index ec093da0a70feb3702507e4f1831e50cb616fa17..68f2b2851d23c22ae21c9bb13b20cf4aa1c0fd35 100644
--- a/media/renderers/skcanvas_video_renderer.cc
+++ b/media/renderers/skcanvas_video_renderer.cc
@@ -270,7 +270,7 @@ class VideoImageGenerator : public SkImageGenerator {
         // TODO: Find a way (API change?) to avoid this copy.
         char* out_line = static_cast<char*>(planes[plane]);
         int out_line_stride = row_bytes[plane];
-        uint8* in_line = frame_->data(plane) + offset;
+        uint8_t* in_line = frame_->data(plane) + offset;
         int in_line_stride = frame_->stride(plane);
         int plane_height = sizes[plane].height();
         if (in_line_stride == out_line_stride) {
@@ -311,7 +311,7 @@ SkCanvasVideoRenderer::~SkCanvasVideoRenderer() {
 void SkCanvasVideoRenderer::Paint(const scoped_refptr<VideoFrame>& video_frame,
                                   SkCanvas* canvas,
                                   const gfx::RectF& dest_rect,
-                                  uint8 alpha,
+                                  uint8_t alpha,
                                   SkXfermode::Mode mode,
                                   VideoRotation video_rotation,
                                   const Context3D& context_3d) {
@@ -473,7 +473,7 @@ void SkCanvasVideoRenderer::ConvertVideoFrameToRGBPixels(
                             video_frame->stride(VideoFrame::kUPlane),
                             video_frame->visible_data(VideoFrame::kVPlane),
                             video_frame->stride(VideoFrame::kVPlane),
-                            static_cast<uint8*>(rgb_pixels), row_bytes,
+                            static_cast<uint8_t*>(rgb_pixels), row_bytes,
                             video_frame->visible_rect().width(),
                             video_frame->visible_rect().height());
       } else if (CheckColorSpace(video_frame, COLOR_SPACE_HD_REC709)) {
@@ -483,7 +483,7 @@ void SkCanvasVideoRenderer::ConvertVideoFrameToRGBPixels(
                             video_frame->stride(VideoFrame::kUPlane),
                             video_frame->visible_data(VideoFrame::kVPlane),
                             video_frame->stride(VideoFrame::kVPlane),
-                            static_cast<uint8*>(rgb_pixels), row_bytes,
+                            static_cast<uint8_t*>(rgb_pixels), row_bytes,
                             video_frame->visible_rect().width(),
                             video_frame->visible_rect().height());
       } else {
@@ -493,7 +493,7 @@ void SkCanvasVideoRenderer::ConvertVideoFrameToRGBPixels(
                             video_frame->stride(VideoFrame::kUPlane),
                             video_frame->visible_data(VideoFrame::kVPlane),
                             video_frame->stride(VideoFrame::kVPlane),
-                            static_cast<uint8*>(rgb_pixels), row_bytes,
+                            static_cast<uint8_t*>(rgb_pixels), row_bytes,
                             video_frame->visible_rect().width(),
                             video_frame->visible_rect().height());
       }
@@ -505,7 +505,7 @@ void SkCanvasVideoRenderer::ConvertVideoFrameToRGBPixels(
                           video_frame->stride(VideoFrame::kUPlane),
                           video_frame->visible_data(VideoFrame::kVPlane),
                           video_frame->stride(VideoFrame::kVPlane),
-                          static_cast<uint8*>(rgb_pixels), row_bytes,
+                          static_cast<uint8_t*>(rgb_pixels), row_bytes,
                           video_frame->visible_rect().width(),
                           video_frame->visible_rect().height());
       break;
@@ -520,7 +520,7 @@ void SkCanvasVideoRenderer::ConvertVideoFrameToRGBPixels(
           video_frame->stride(VideoFrame::kVPlane),
           video_frame->visible_data(VideoFrame::kAPlane),
           video_frame->stride(VideoFrame::kAPlane),
-          static_cast<uint8*>(rgb_pixels), row_bytes,
+          static_cast<uint8_t*>(rgb_pixels), row_bytes,
           video_frame->visible_rect().width(),
           video_frame->visible_rect().height(),
           1);  // 1 = enable RGB premultiplication by Alpha.
@@ -533,7 +533,7 @@ void SkCanvasVideoRenderer::ConvertVideoFrameToRGBPixels(
                           video_frame->stride(VideoFrame::kUPlane),
                           video_frame->visible_data(VideoFrame::kVPlane),
                           video_frame->stride(VideoFrame::kVPlane),
-                          static_cast<uint8*>(rgb_pixels), row_bytes,
+                          static_cast<uint8_t*>(rgb_pixels), row_bytes,
                           video_frame->visible_rect().width(),
                           video_frame->visible_rect().height());
       break;
@@ -572,7 +572,7 @@ void SkCanvasVideoRenderer::CopyVideoFrameSingleTextureToGLTexture(
       << mailbox_holder.texture_target;
 
   gl->WaitSyncTokenCHROMIUM(mailbox_holder.sync_token.GetConstData());
-  uint32 source_texture = gl->CreateAndConsumeTextureCHROMIUM(
+  uint32_t source_texture = gl->CreateAndConsumeTextureCHROMIUM(
       mailbox_holder.texture_target, mailbox_holder.mailbox.name);
 
   // The video is stored in a unmultiplied format, so premultiply