Revert 191364 "cc: Add ‘chromium_code’: 1 to cc.gyp and cc_t..."

trunk/src/cc/layers/picture_layer_impl_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/picture_layer_impl.h"
 
 #include <utility>
 
 #include "cc/layers/picture_layer.h"
 #include "cc/test/fake_content_layer_client.h"
@@ skipping 215 matching lines @@
 
     host_impl_.active_tree()->SetPageScaleFactorAndLimits(1.f, 1.f, 1.f);
     float result_scale_x, result_scale_y;
     gfx::Size result_bounds;
     active_layer_->CalculateContentsScale(
         1.f, false, &result_scale_x, &result_scale_y, &result_bounds);
 
     // Add 1x1 rects at the centers of each tile, then re-record pile contents
     std::vector<Tile*> tiles =
         active_layer_->tilings().tiling_at(0)->AllTilesForTesting();
-    EXPECT_EQ(16u, tiles.size());
+    EXPECT_EQ(16, tiles.size());
     std::vector<SkRect> rects;
     std::vector<Tile*>::const_iterator tile_iter;
     for (tile_iter = tiles.begin(); tile_iter < tiles.end(); tile_iter++) {
       gfx::Point tile_center = (*tile_iter)->content_rect().CenterPoint();
       gfx::Rect rect(tile_center.x(), tile_center.y(), 1, 1);
       active_pile->add_draw_rect(rect);
       rects.push_back(SkRect::MakeXYWH(rect.x(), rect.y(), 1, 1));
     }
     // Force re-record with newly injected content
     active_pile->RemoveRecordingAt(0, 0);
     active_pile->AddRecordingAt(0, 0);
 
     SkBitmap store;
     store.setConfig(SkBitmap::kNo_Config, 1000, 1000);
     SkDevice device(store);
 
     std::vector<SkRect>::const_iterator rect_iter = rects.begin();
     for (tile_iter = tiles.begin(); tile_iter < tiles.end(); tile_iter++) {
       MockCanvas mock_canvas(&device);
       active_pile->Raster(&mock_canvas, (*tile_iter)->content_rect(), 1.0f);
 
       // This test verifies that when drawing the contents of a specific tile
       // at content scale 1.0, the playback canvas never receives content from
       // neighboring tiles which indicates that the tile grid embedded in
       // SkPicture is perfectly aligned with the compositor's tiles.
       // Note: There are two rects: the initial clear and the explicitly
       // recorded rect. We only care about the second one.
-      EXPECT_EQ(2u, mock_canvas.rects_.size());
+      EXPECT_EQ(2, mock_canvas.rects_.size());
       EXPECT_EQ(*rect_iter, mock_canvas.rects_[1]);
       rect_iter++;
     }
   }
 
   FakeImplProxy proxy_;
   FakeLayerTreeHostImpl host_impl_;
   int id_;
   TestablePictureLayerImpl* pending_layer_;
   TestablePictureLayerImpl* active_layer_;
@@ skipping 412 matching lines @@
   used_tilings.push_back(active_layer_->tilings().tiling_at(1));
   active_layer_->CleanUpTilingsOnActiveLayer(used_tilings);
   ASSERT_EQ(3u, active_layer_->tilings().num_tilings());
   used_tilings.clear();
   active_layer_->CleanUpTilingsOnActiveLayer(used_tilings);
   ASSERT_EQ(2u, active_layer_->tilings().num_tilings());
 }
 
 }  // namespace
 }  // namespace cc