cc: Fix build issues for adding ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp

cc/base/tiling_data_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/base/tiling_data.h"
 
 #include <vector>
 
 #include "cc/test/geometry_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 936 matching lines @@
       for (size_t i = 0; i < expected.size(); ++i) {
         if (expected[i] == iter.index()) {
           expected[i] = expected.back();
           expected.pop_back();
           found = true;
           break;
         }
       }
       EXPECT_TRUE(found);
     }
-    EXPECT_EQ(0, expected.size());
+    EXPECT_TRUE(expected.empty());
   }
 
   // Make sure this also works with a difference iterator and an empty ignore.
   {
     std::vector<std::pair<int, int> > expected = original_expected;
     for (TilingData::DifferenceIterator iter(&data, rect, gfx::Rect());
          iter; ++iter) {
       bool found = false;
       for (size_t i = 0; i < expected.size(); ++i) {
         if (expected[i] == iter.index()) {
           expected[i] = expected.back();
           expected.pop_back();
           found = true;
           break;
         }
       }
       EXPECT_TRUE(found);
     }
-    EXPECT_EQ(0, expected.size());
+    EXPECT_TRUE(expected.empty());
   }
 }
 
 TEST(TilingDataTest, IteratorNoBorderTexels) {
   TilingData data(gfx::Size(10, 10), gfx::Size(40, 25), false);
   // X border index by src coord: [0-10), [10-20), [20, 30), [30, 40)
   // Y border index by src coord: [0-10), [10-20), [20, 25)
   TestIterate(data, gfx::Rect(0, 0, 40, 25), 0, 0, 3, 2);
   TestIterate(data, gfx::Rect(15, 15, 8, 8), 1, 1, 2, 2);
 
@@ skipping 69 matching lines @@
   std::vector<std::pair<int, int> > expected;
   for (int y = 0; y < data.num_tiles_y(); ++y) {
     for (int x = 0; x < data.num_tiles_x(); ++x) {
       gfx::Rect bounds = data.TileBoundsWithBorder(x, y);
       if (bounds.Intersects(consider) && !bounds.Intersects(ignore))
         expected.push_back(std::make_pair(x, y));
     }
   }
 
   // Sanity check the test.
-  EXPECT_EQ(num_tiles, expected.size());
+  EXPECT_EQ(static_cast<size_t>(num_tiles), expected.size());

[jamesr, 2013/03/29 00:07:16]

num_tiles is a size_t, according to the function signature. why is this cast
needed?

[danakj, 2013/03/29 00:17:35]

Oh.. hm.. it's not. removed.

 
   for (TilingData::DifferenceIterator iter(&data, consider, ignore);
        iter; ++iter) {
     bool found = false;
     for (size_t i = 0; i < expected.size(); ++i) {
       if (expected[i] == iter.index()) {
         expected[i] = expected.back();
         expected.pop_back();
         found = true;
         break;
       }
     }
     EXPECT_TRUE(found);
   }
-  EXPECT_EQ(0, expected.size());
+  EXPECT_TRUE(expected.empty());
 }
 
 TEST(TilingDataTest, DifferenceIteratorIgnoreGeometry) {
   // This test is checking that the iterator can handle different geometries of
   // ignore rects relative to the consider rect.  The consider rect indices
   // themselves are mostly tested by the non-difference iterator tests, so the
   // full rect is mostly used here for simplicity.
 
   // X border index by src coord: [0-10), [10-20), [20, 30), [30, 40)
   // Y border index by src coord: [0-10), [10-20), [20, 25)
@@ skipping 70 matching lines @@
   TestDiff(big_border, gfx::Rect(5, 5, 100, 100), gfx::Rect(5, 5, 1, 1), 0);
 }
 
 TEST(TilingDataTest, DifferenceIteratorNoTiles) {
   TilingData data(gfx::Size(100, 100), gfx::Size(), false);
   TestDiff(data, gfx::Rect(0, 0, 100, 100), gfx::Rect(0, 0, 5, 5), 0);
 }
 
 }  // namespace
 }  // namespace cc