| Index: remoting/base/util.h
 | 
| diff --git a/remoting/base/util.h b/remoting/base/util.h
 | 
| index 262b5519d761dbf908d792cf010f51cec3f0a92c..b60e0721fe3b74038b0666a52ca2d3f9e614541c 100644
 | 
| --- a/remoting/base/util.h
 | 
| +++ b/remoting/base/util.h
 | 
| @@ -7,7 +7,6 @@
 | 
|  
 | 
|  #include "media/base/video_frame.h"
 | 
|  #include "third_party/skia/include/core/SkRect.h"
 | 
| -#include "ui/gfx/rect.h"
 | 
|  
 | 
|  namespace remoting {
 | 
|  
 | 
| @@ -21,7 +20,7 @@ void ConvertYUVToRGB32WithRect(const uint8* y_plane,
 | 
|                                 const uint8* u_plane,
 | 
|                                 const uint8* v_plane,
 | 
|                                 uint8* rgb_plane,
 | 
| -                               const gfx::Rect& rect,
 | 
| +                               const SkIRect& rect,
 | 
|                                 int y_stride,
 | 
|                                 int uv_stride,
 | 
|                                 int rgb_stride);
 | 
| @@ -30,8 +29,8 @@ void ScaleYUVToRGB32WithRect(const uint8* y_plane,
 | 
|                               const uint8* u_plane,
 | 
|                               const uint8* v_plane,
 | 
|                               uint8* rgb_plane,
 | 
| -                             const gfx::Rect& source_rect,
 | 
| -                             const gfx::Rect& dest_rect,
 | 
| +                             const SkIRect& source_rect,
 | 
| +                             const SkIRect& dest_rect,
 | 
|                               int y_stride,
 | 
|                               int uv_stride,
 | 
|                               int rgb_stride);
 | 
| @@ -51,13 +50,13 @@ void ConvertRGB32ToYUVWithRect(const uint8* rgb_plane,
 | 
|  int RoundToTwosMultiple(int x);
 | 
|  
 | 
|  // Align the sides of the rectangle to multiples of 2 (expanding outwards).
 | 
| -gfx::Rect AlignRect(const gfx::Rect& rect);
 | 
| +SkIRect AlignRect(const SkIRect& rect);
 | 
|  
 | 
|  // Return a scaled rectangle using the horizontal and vertical scale
 | 
|  // factors.
 | 
| -gfx::Rect ScaleRect(const gfx::Rect& rect,
 | 
| -                    double horizontal_ratio,
 | 
| -                    double vertical_ratio);
 | 
| +SkIRect ScaleRect(const SkIRect& rect,
 | 
| +                  double horizontal_ratio,
 | 
| +                  double vertical_ratio);
 | 
|  
 | 
|  // Copy pixels in the rectangle from source to destination.
 | 
|  void CopyRect(const uint8* src_plane,
 | 
| 
 |