CL for perf tryjob on android

cc/layers/picture_layer_impl_unittest.cc

Index: cc/layers/picture_layer_impl_unittest.cc
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 14474422391221f43edb2b64145f036a6faeb99a..37f72f2dd740ab13cea0a68cc3ff072d7687e0b6 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -4891,8 +4891,10 @@ TEST_F(TileSizeTest, TileSizes) {
 
   layer->set_gpu_raster_max_texture_size(host_impl_.device_viewport_size());
   result = layer->CalculateTileSize(gfx::Size(10000, 10000));
-  EXPECT_EQ(result.width(), 2000 + 2 * PictureLayerTiling::kBorderTexels);
-  EXPECT_EQ(result.height(), 500 + 2);
+  EXPECT_EQ(result.width(),
+            MathUtil::UncheckedRoundUp(
+                2000 + 2 * PictureLayerTiling::kBorderTexels, 4));
+  EXPECT_EQ(result.height(), 504);  // 500 + 2, 4-byte aligned.
 
   // Clamp and round-up, when smaller than viewport.
   // Tile-height doubles to 50% when width shrinks to <= 50%.
@@ -4900,7 +4902,7 @@ TEST_F(TileSizeTest, TileSizes) {
   layer->set_gpu_raster_max_texture_size(host_impl_.device_viewport_size());
   result = layer->CalculateTileSize(gfx::Size(447, 10000));
   EXPECT_EQ(result.width(), 448);
-  EXPECT_EQ(result.height(), 500 + 2);
+  EXPECT_EQ(result.height(), 504);  // 500 + 2, 4-byte aliged.
 
   // Largest layer is 50% of viewport width (rounded up), and
   // 50% of viewport in height.
@@ -4909,7 +4911,7 @@ TEST_F(TileSizeTest, TileSizes) {
   EXPECT_EQ(result.height(), 448);
   result = layer->CalculateTileSize(gfx::Size(500, 499));
   EXPECT_EQ(result.width(), 512);
-  EXPECT_EQ(result.height(), 500 + 2);
+  EXPECT_EQ(result.height(), 504);  // 500 + 2, 4-byte aligned.
 }
 
 TEST_F(NoLowResPictureLayerImplTest, LowResWasHighResCollision) {