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

> cc: Add ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp
> 
> And fix compile errors that it causes.
> 
> Review URL: https://codereview.chromium.org/13206004

TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/13316003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191371 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 52 insertions, 67 deletions

diff --git a/cc/resources/picture_layer_tiling_set.cc b/cc/resources/picture_layer_tiling_set.cc
index b5460b9..f3c73c2 100644
--- a/cc/resources/picture_layer_tiling_set.cc
+++ b/cc/resources/picture_layer_tiling_set.cc
@@ -4,8 +4,6 @@
 
 #include "cc/resources/picture_layer_tiling_set.h"
 
-#include <limits>
-
 namespace cc {
 
 namespace {
@@ -135,11 +133,7 @@ PictureLayerTilingSet::CoverageIterator::CoverageIterator(
     }
   }
 
-  DCHECK_LE(set_->tilings_.size(),
-            static_cast<size_t>(std::numeric_limits<int>::max()));
-
-  int num_tilings = set_->tilings_.size();
-  if (ideal_tiling_ == num_tilings && ideal_tiling_ > 0)
+  if (ideal_tiling_ == set_->tilings_.size() && ideal_tiling_ > 0)
     ideal_tiling_--;
 
   ++(*this);
diff --git a/cc/resources/picture_pile.cc b/cc/resources/picture_pile.cc
index a45dd9e..85a2e9b 100644
--- a/cc/resources/picture_pile.cc
+++ b/cc/resources/picture_pile.cc
@@ -13,7 +13,7 @@
 namespace {
 // Maximum number of pictures that can overlap before we collapse them into
 // a larger one.
-const size_t kMaxOverlapping = 2;
+const int kMaxOverlapping = 2;
 // Maximum percentage area of the base picture another picture in the picture
 // list can be.  If higher, we destroy the list and recreate from scratch.
 const float kResetThreshold = 0.7f;
diff --git a/cc/resources/prioritized_resource.cc b/cc/resources/prioritized_resource.cc
index fdc20c3..f5ebf94 100644
--- a/cc/resources/prioritized_resource.cc
+++ b/cc/resources/prioritized_resource.cc
@@ -165,8 +165,7 @@ bool PrioritizedResource::Backing::CanBeRecycled() const {
 }
 
 void PrioritizedResource::Backing::UpdatePriority() {
-  DCHECK(!proxy() ||
-         (proxy()->IsImplThread() && proxy()->IsMainThreadBlocked()));
+  DCHECK(!proxy() || proxy()->IsImplThread() && proxy()->IsMainThreadBlocked());
   if (owner_) {
     priority_at_last_priority_update_ = owner_->request_priority();
     was_above_priority_cutoff_at_last_priority_update_ =
@@ -178,8 +177,7 @@ void PrioritizedResource::Backing::UpdatePriority() {
 }
 
 void PrioritizedResource::Backing::UpdateInDrawingImplTree() {
-  DCHECK(!proxy() ||
-         (proxy()->IsImplThread() && proxy()->IsMainThreadBlocked()));
+  DCHECK(!proxy() || proxy()->IsImplThread() && proxy()->IsMainThreadBlocked());
   in_drawing_impl_tree_ = !!owner();
   if (!in_drawing_impl_tree_) {
     DCHECK_EQ(priority_at_last_priority_update_,
diff --git a/cc/resources/prioritized_resource_manager.cc b/cc/resources/prioritized_resource_manager.cc
index 1a4bea3..970336d 100644
--- a/cc/resources/prioritized_resource_manager.cc
+++ b/cc/resources/prioritized_resource_manager.cc
@@ -15,13 +15,13 @@
 namespace cc {
 
 PrioritizedResourceManager::PrioritizedResourceManager(const Proxy* proxy)
-    : max_memory_limit_bytes_(DefaultMemoryAllocationLimit()),
+    : proxy_(proxy),
+      max_memory_limit_bytes_(DefaultMemoryAllocationLimit()),
       external_priority_cutoff_(PriorityCalculator::AllowEverythingCutoff()),
       memory_use_bytes_(0),
+      max_memory_needed_bytes_(0), 
       memory_above_cutoff_bytes_(0),
-      max_memory_needed_bytes_(0),
       memory_available_bytes_(0),
-      proxy_(proxy),
       backings_tail_not_sorted_(false),
       memory_visible_bytes_(0),
       memory_visible_and_nearby_bytes_(0),
diff --git a/cc/resources/prioritized_resource_unittest.cc b/cc/resources/prioritized_resource_unittest.cc
index b820933..1c8de7e 100644
--- a/cc/resources/prioritized_resource_unittest.cc
+++ b/cc/resources/prioritized_resource_unittest.cc
@@ -262,10 +262,10 @@ TEST_F(PrioritizedResourceTest, ChangePriorityCutoff) {
     impl_thread_and_main_thread_blocked(&proxy_);
     resource_manager->ReduceMemoryOnImplThread(
         TexturesMemorySize(8), 104, ResourceProvider());
-    EXPECT_EQ(0u, EvictedBackingCount(resource_manager.get()));
+    EXPECT_EQ(0, EvictedBackingCount(resource_manager.get()));
     resource_manager->ReduceMemoryOnImplThread(
         TexturesMemorySize(8), 103, ResourceProvider());
-    EXPECT_EQ(1u, EvictedBackingCount(resource_manager.get()));
+    EXPECT_EQ(1, EvictedBackingCount(resource_manager.get()));
   }
   resource_manager->UnlinkAndClearEvictedBackings();
   EXPECT_EQ(TexturesMemorySize(3), resource_manager->MemoryUseBytes());
@@ -704,19 +704,19 @@ TEST_F(PrioritizedResourceTest, ClearUploadsToEvictedResources) {
     EXPECT_TRUE(textures[i]->have_backing_texture());
 
   queue.ClearUploadsToEvictedResources();
-  EXPECT_EQ(4u, queue.FullUploadSize());
+  EXPECT_EQ(4, queue.FullUploadSize());
 
   resource_manager->ReduceMemoryOnImplThread(
       TexturesMemorySize(1),
       PriorityCalculator::AllowEverythingCutoff(),
       ResourceProvider());
   queue.ClearUploadsToEvictedResources();
-  EXPECT_EQ(1u, queue.FullUploadSize());
+  EXPECT_EQ(1, queue.FullUploadSize());
 
   resource_manager->ReduceMemoryOnImplThread(
       0, PriorityCalculator::AllowEverythingCutoff(), ResourceProvider());
   queue.ClearUploadsToEvictedResources();
-  EXPECT_EQ(0u, queue.FullUploadSize());
+  EXPECT_EQ(0, queue.FullUploadSize());
 }
 
 TEST_F(PrioritizedResourceTest, UsageStatistics) {
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
index 7e3d15c..6a5ea23 100644
--- a/cc/resources/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_unittest.cc
@@ -139,7 +139,7 @@ class ResourceProviderContext : public TestWebGraphicsContext3D {
   }
 
   virtual void bindTexture(WGC3Denum target, WebGLId texture) OVERRIDE {
-    ASSERT_EQ(static_cast<unsigned>(GL_TEXTURE_2D), target);
+    ASSERT_EQ(target, GL_TEXTURE_2D);
     ASSERT_TRUE(!texture || textures_.find(texture) != textures_.end());
     current_texture_ = texture;
   }
@@ -164,8 +164,8 @@ class ResourceProviderContext : public TestWebGraphicsContext3D {
                                WGC3Dint width,
                                WGC3Dint height) OVERRIDE {
     ASSERT_TRUE(current_texture_);
-    ASSERT_EQ(static_cast<unsigned>(GL_TEXTURE_2D), target);
-    ASSERT_EQ(1, levels);
+    ASSERT_EQ(target, GL_TEXTURE_2D);
+    ASSERT_EQ(levels, 1);
     WGC3Denum format = GL_RGBA;
     switch (internalformat) {
       case GL_RGBA8_OES:
@@ -189,11 +189,11 @@ class ResourceProviderContext : public TestWebGraphicsContext3D {
                           WGC3Denum type,
                           const void* pixels) OVERRIDE {
     ASSERT_TRUE(current_texture_);
-    ASSERT_EQ(static_cast<unsigned>(GL_TEXTURE_2D), target);
+    ASSERT_EQ(target, GL_TEXTURE_2D);
     ASSERT_FALSE(level);
     ASSERT_EQ(internalformat, format);
     ASSERT_FALSE(border);
-    ASSERT_EQ(static_cast<unsigned>(GL_UNSIGNED_BYTE), type);
+    ASSERT_EQ(type, GL_UNSIGNED_BYTE);
     AllocateTexture(gfx::Size(width, height), format);
     if (pixels)
       SetPixels(0, 0, width, height, pixels);
@@ -209,11 +209,11 @@ class ResourceProviderContext : public TestWebGraphicsContext3D {
                              WGC3Denum type,
                              const void* pixels) OVERRIDE {
     ASSERT_TRUE(current_texture_);
-    ASSERT_EQ(static_cast<unsigned>(GL_TEXTURE_2D), target);
+    ASSERT_EQ(target, GL_TEXTURE_2D);
     ASSERT_FALSE(level);
     ASSERT_TRUE(textures_.get(current_texture_));
     ASSERT_EQ(textures_.get(current_texture_)->format, format);
-    ASSERT_EQ(static_cast<unsigned>(GL_UNSIGNED_BYTE), type);
+    ASSERT_EQ(type, GL_UNSIGNED_BYTE);
     ASSERT_TRUE(pixels);
     SetPixels(xoffset, yoffset, width, height, pixels);
   }
@@ -221,7 +221,7 @@ class ResourceProviderContext : public TestWebGraphicsContext3D {
   virtual void texParameteri(WGC3Denum target, WGC3Denum param, WGC3Dint value)
       OVERRIDE {
     ASSERT_TRUE(current_texture_);
-    ASSERT_EQ(static_cast<unsigned>(GL_TEXTURE_2D), target);
+    ASSERT_EQ(target, GL_TEXTURE_2D);
     Texture* texture = textures_.get(current_texture_);
     ASSERT_TRUE(texture);
     if (param != GL_TEXTURE_MIN_FILTER)
@@ -236,7 +236,7 @@ class ResourceProviderContext : public TestWebGraphicsContext3D {
   virtual void produceTextureCHROMIUM(WGC3Denum target,
                                       const WGC3Dbyte* mailbox) OVERRIDE {
     ASSERT_TRUE(current_texture_);
-    ASSERT_EQ(static_cast<unsigned>(GL_TEXTURE_2D), target);
+    ASSERT_EQ(target, GL_TEXTURE_2D);
 
     // Delay moving the texture into the mailbox until the next
     // InsertSyncPoint, so that it is not visible to other contexts that
@@ -251,7 +251,7 @@ class ResourceProviderContext : public TestWebGraphicsContext3D {
   virtual void consumeTextureCHROMIUM(WGC3Denum target,
                                       const WGC3Dbyte* mailbox) OVERRIDE {
     ASSERT_TRUE(current_texture_);
-    ASSERT_EQ(static_cast<unsigned>(GL_TEXTURE_2D), target);
+    ASSERT_EQ(target, GL_TEXTURE_2D);
     textures_.set(
         current_texture_,
         shared_data_->ConsumeTexture(mailbox, last_waited_sync_point_));
@@ -679,11 +679,9 @@ TEST_P(ResourceProviderTest, TextureFilters) {
   uint8_t data[4] = { 1, 2, 3, 4 };
   gfx::Rect rect(size);
   child_resource_provider->SetPixels(id, data, rect, rect, gfx::Vector2d());
-  EXPECT_EQ(static_cast<unsigned>(GL_LINEAR),
-            GetResourceFilter(child_resource_provider.get(), id));
+  EXPECT_EQ(GL_LINEAR, GetResourceFilter(child_resource_provider.get(), id));
   SetResourceFilter(child_resource_provider.get(), id, GL_NEAREST);
-  EXPECT_EQ(static_cast<unsigned>(GL_NEAREST),
-            GetResourceFilter(child_resource_provider.get(), id));
+  EXPECT_EQ(GL_NEAREST, GetResourceFilter(child_resource_provider.get(), id));
 
   int child_id = resource_provider_->CreateChild();
   {
@@ -694,18 +692,16 @@ TEST_P(ResourceProviderTest, TextureFilters) {
     child_resource_provider->PrepareSendToParent(resource_ids_to_transfer,
                                                  &list);
     ASSERT_EQ(1u, list.size());
-    EXPECT_EQ(static_cast<unsigned>(GL_NEAREST), list[0].filter);
+    EXPECT_EQ(GL_NEAREST, list[0].filter);
     resource_provider_->ReceiveFromChild(child_id, list);
   }
   ResourceProvider::ResourceIdMap resource_map =
       resource_provider_->GetChildToParentMap(child_id);
   ResourceProvider::ResourceId mapped_id = resource_map[id];
   EXPECT_NE(0u, mapped_id);
-  EXPECT_EQ(static_cast<unsigned>(GL_NEAREST),
-            GetResourceFilter(resource_provider_.get(), mapped_id));
+  EXPECT_EQ(GL_NEAREST, GetResourceFilter(resource_provider_.get(), mapped_id));
   SetResourceFilter(resource_provider_.get(), mapped_id, GL_LINEAR);
-  EXPECT_EQ(static_cast<unsigned>(GL_LINEAR),
-            GetResourceFilter(resource_provider_.get(), mapped_id));
+  EXPECT_EQ(GL_LINEAR, GetResourceFilter(resource_provider_.get(), mapped_id));
   {
     // Transfer resources back from the parent to the child.
     ResourceProvider::ResourceIdArray resource_ids_to_transfer;
@@ -714,14 +710,12 @@ TEST_P(ResourceProviderTest, TextureFilters) {
     resource_provider_->PrepareSendToChild(
         child_id, resource_ids_to_transfer, &list);
     ASSERT_EQ(1u, list.size());
-    EXPECT_EQ(static_cast<unsigned>(GL_LINEAR), list[0].filter);
+    EXPECT_EQ(GL_LINEAR, list[0].filter);
     child_resource_provider->ReceiveFromParent(list);
   }
-  EXPECT_EQ(static_cast<unsigned>(GL_LINEAR),
-            GetResourceFilter(child_resource_provider.get(), id));
+  EXPECT_EQ(GL_LINEAR, GetResourceFilter(child_resource_provider.get(), id));
   SetResourceFilter(child_resource_provider.get(), id, GL_NEAREST);
-  EXPECT_EQ(static_cast<unsigned>(GL_NEAREST),
-            GetResourceFilter(child_resource_provider.get(), id));
+  EXPECT_EQ(GL_NEAREST, GetResourceFilter(child_resource_provider.get(), id));
 }
 
 void ReleaseTextureMailbox(unsigned* release_sync_point, unsigned sync_point) {
@@ -751,7 +745,7 @@ TEST_P(ResourceProviderTest, TransferMailboxResources) {
   ResourceProvider::ResourceId resource =
       resource_provider_->CreateResourceFromTextureMailbox(
           TextureMailbox(mailbox, callback, sync_point));
-  EXPECT_EQ(1, context()->texture_count());
+  EXPECT_EQ(1u, context()->texture_count());
   EXPECT_EQ(0u, release_sync_point);
   {
     // Transfer the resource, expect the sync points to be consistent.
@@ -761,7 +755,7 @@ TEST_P(ResourceProviderTest, TransferMailboxResources) {
     resource_provider_->PrepareSendToParent(resource_ids_to_transfer, &list);
     ASSERT_EQ(1u, list.size());
     EXPECT_LE(sync_point, list[0].sync_point);
-    EXPECT_EQ(0,
+    EXPECT_EQ(0u,
               memcmp(mailbox.name, list[0].mailbox.name, sizeof(mailbox.name)));
     EXPECT_EQ(0u, release_sync_point);
 
@@ -771,7 +765,7 @@ TEST_P(ResourceProviderTest, TransferMailboxResources) {
     context()->consumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
     uint8_t test_data[4] = { 0 };
     context()->GetPixels(gfx::Size(1, 1), GL_RGBA, test_data);
-    EXPECT_EQ(0, memcmp(data, test_data, sizeof(data)));
+    EXPECT_EQ(0u, memcmp(data, test_data, sizeof(data)));
     context()->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
     context()->deleteTexture(other_texture);
     list[0].sync_point = context()->insertSyncPoint();
@@ -780,7 +774,7 @@ TEST_P(ResourceProviderTest, TransferMailboxResources) {
     // Receive the resource, then delete it, expect the sync points to be
     // consistent.
     resource_provider_->ReceiveFromParent(list);
-    EXPECT_EQ(1, context()->texture_count());
+    EXPECT_EQ(1u, context()->texture_count());
     EXPECT_EQ(0u, release_sync_point);
 
     resource_provider_->DeleteResource(resource);
@@ -794,7 +788,7 @@ TEST_P(ResourceProviderTest, TransferMailboxResources) {
   release_sync_point = 0;
   resource = resource_provider_->CreateResourceFromTextureMailbox(
       TextureMailbox(mailbox, callback, sync_point));
-  EXPECT_EQ(1, context()->texture_count());
+  EXPECT_EQ(1u, context()->texture_count());
   EXPECT_EQ(0u, release_sync_point);
   {
     // Transfer the resource, expect the sync points to be consistent.
@@ -804,7 +798,7 @@ TEST_P(ResourceProviderTest, TransferMailboxResources) {
     resource_provider_->PrepareSendToParent(resource_ids_to_transfer, &list);
     ASSERT_EQ(1u, list.size());
     EXPECT_LE(sync_point, list[0].sync_point);
-    EXPECT_EQ(0,
+    EXPECT_EQ(0u,
               memcmp(mailbox.name, list[0].mailbox.name, sizeof(mailbox.name)));
     EXPECT_EQ(0u, release_sync_point);
 
@@ -814,7 +808,7 @@ TEST_P(ResourceProviderTest, TransferMailboxResources) {
     context()->consumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
     uint8_t test_data[4] = { 0 };
     context()->GetPixels(gfx::Size(1, 1), GL_RGBA, test_data);
-    EXPECT_EQ(0, memcmp(data, test_data, sizeof(data)));
+    EXPECT_EQ(0u, memcmp(data, test_data, sizeof(data)));
     context()->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
     context()->deleteTexture(other_texture);
     list[0].sync_point = context()->insertSyncPoint();
@@ -822,7 +816,7 @@ TEST_P(ResourceProviderTest, TransferMailboxResources) {
 
     // Delete the resource, which shouldn't do anything.
     resource_provider_->DeleteResource(resource);
-    EXPECT_EQ(1, context()->texture_count());
+    EXPECT_EQ(1u, context()->texture_count());
     EXPECT_EQ(0u, release_sync_point);
 
     // Then receive the resource which should release the mailbox, expect the
@@ -955,7 +949,6 @@ TEST_P(ResourceProviderTest, ManagedResource) {
                             GL_TEXTURE_POOL_MANAGED_CHROMIUM));
   ResourceProvider::ResourceId id = resource_provider->CreateManagedResource(
       size, format, ResourceProvider::TextureUsageAny);
-  EXPECT_NE(0u, id);
 
   Mock::VerifyAndClearExpectations(context);
 }
diff --git a/cc/resources/resource_update_controller_unittest.cc b/cc/resources/resource_update_controller_unittest.cc
index 8b751c3..c4a8ee75 100644
--- a/cc/resources/resource_update_controller_unittest.cc
+++ b/cc/resources/resource_update_controller_unittest.cc
@@ -72,7 +72,6 @@ class ResourceUpdateControllerTest : public Test {
       : proxy_(scoped_ptr<Thread>(NULL)),
         queue_(make_scoped_ptr(new ResourceUpdateQueue)),
         resource_manager_(PrioritizedResourceManager::Create(&proxy_)),
-        query_results_available_(0),
         full_upload_count_expected_(0),
         partial_count_expected_(0),
         total_upload_count_expected_(0),
@@ -80,7 +79,8 @@ class ResourceUpdateControllerTest : public Test {
         num_consecutive_flushes_(0),
         num_dangling_uploads_(0),
         num_total_uploads_(0),
-        num_total_flushes_(0) {}
+        num_total_flushes_(0),
+        query_results_available_(0) {}
 
   virtual ~ResourceUpdateControllerTest() {
     DebugScopedSetImplThreadAndMainThreadBlocked
diff --git a/cc/resources/scoped_resource.cc b/cc/resources/scoped_resource.cc
index 14209e0..b31272f 100644
--- a/cc/resources/scoped_resource.cc
+++ b/cc/resources/scoped_resource.cc
@@ -27,7 +27,7 @@ bool ScopedResource::Allocate(const gfx::Size& size, GLenum format,
   allocate_thread_id_ = base::PlatformThread::CurrentId();
 #endif
 
-  return id() != 0;
+  return id();
 }
 
 void ScopedResource::Free() {
diff --git a/cc/resources/scoped_resource_unittest.cc b/cc/resources/scoped_resource_unittest.cc
index 97e93d2..a9a087e 100644
--- a/cc/resources/scoped_resource_unittest.cc
+++ b/cc/resources/scoped_resource_unittest.cc
@@ -42,7 +42,7 @@ TEST(ScopedResourceTest, CreateScopedResource) {
   EXPECT_EQ(expected_bytes, texture->bytes());
 
   EXPECT_LT(0u, texture->id());
-  EXPECT_EQ(static_cast<unsigned>(GL_RGBA), texture->format());
+  EXPECT_EQ(GL_RGBA, texture->format());
   EXPECT_EQ(gfx::Size(30, 30), texture->size());
 }
 
diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
index 47b7f36..ed00374 100644
--- a/cc/resources/tile_manager.cc
+++ b/cc/resources/tile_manager.cc
@@ -31,12 +31,12 @@ namespace {
 #if defined(OS_ANDROID)
 // For reference, the Nexus10 can upload 1MB in about 2.5ms.
 // Assuming a three frame deep pipeline this implies ~20MB.
-const size_t kMaxPendingUploadBytes = 20 * 1024 * 1024;
+const int kMaxPendingUploadBytes = 20 * 1024 * 1024;
 // TODO(epenner): We should remove this upload limit (crbug.com/176197)
-const size_t kMaxPendingUploads = 72;
+const int kMaxPendingUploads = 72;
 #else
-const size_t kMaxPendingUploadBytes = 100 * 1024 * 1024;
-const size_t kMaxPendingUploads = 1000;
+const int kMaxPendingUploadBytes = 100 * 1024 * 1024;
+const int kMaxPendingUploads = 1000;
 #endif
 
 #if defined(OS_ANDROID)
@@ -165,14 +165,14 @@ TileManager::TileManager(
       bytes_pending_upload_(0),
       has_performed_uploads_since_last_flush_(false),
       ever_exceeded_memory_budget_(false),
-      rendering_stats_instrumentation_(rendering_stats_instrumentation),
       max_prepaint_tile_distance_(max_prepaint_tile_distance),
       use_cheapness_estimator_(use_cheapness_estimator),
       use_color_estimator_(use_color_estimator),
       prediction_benchmarking_(prediction_benchmarking),
       did_initialize_visible_tile_(false),
       pending_tasks_(0),
-      max_pending_tasks_(kMaxNumPendingTasksPerThread * num_raster_threads) {
+      max_pending_tasks_(kMaxNumPendingTasksPerThread * num_raster_threads),
+      rendering_stats_instrumentation_(rendering_stats_instrumentation) {
   for (int i = 0; i < NUM_STATES; ++i) {
     for (int j = 0; j < NUM_TREES; ++j) {
       for (int k = 0; k < NUM_BINS; ++k)
@@ -190,9 +190,9 @@ TileManager::~TileManager() {
   // resources.
   raster_worker_pool_.reset();
   AbortPendingTileUploads();
-  DCHECK_EQ(0u, tiles_with_pending_upload_.size());
-  DCHECK_EQ(0u, all_tiles_.size());
-  DCHECK_EQ(0u, live_or_allocated_tiles_.size());
+  DCHECK_EQ(tiles_with_pending_upload_.size(), 0);
+  DCHECK_EQ(all_tiles_.size(), 0);
+  DCHECK_EQ(live_or_allocated_tiles_.size(), 0);
 }
 
 void TileManager::SetGlobalState(
@@ -1034,7 +1034,7 @@ void TileManager::RunRasterTask(
       RecordCheapnessPredictorResults(is_predicted_cheap, is_actually_cheap);
 
       DCHECK_EQ(bitmap.rowBytes(),
-                static_cast<size_t>(bitmap.width() * bitmap.bytesPerPixel()));
+                bitmap.width() * bitmap.bytesPerPixel());
 
       RecordSolidColorPredictorResults(
           reinterpret_cast<SkColor*>(bitmap.getPixels()),