cc: Fix BytesPerPixel issue and refactor.

cc/resources/resource_pool_unittest.cc

 // Copyright 2015 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/resources/resource_pool.h"
 
+#include "cc/resources/resource_util.h"
 #include "cc/resources/scoped_resource.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/fake_resource_provider.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
@@ skipping 30 matching lines @@
 }
 
 TEST_F(ResourcePoolTest, AccountingSingleResource) {
   // Limits high enough to not be hit by this test.
   size_t bytes_limit = 10 * 1024 * 1024;
   size_t count_limit = 100;
   resource_pool_->SetResourceUsageLimits(bytes_limit, bytes_limit, count_limit);
 
   gfx::Size size(100, 100);
   ResourceFormat format = RGBA_8888;
-  size_t resource_bytes = Resource::UncheckedMemorySizeBytes(size, format);
+  size_t resource_bytes =
+      ResourceUtil::UncheckedSizeInBytes<size_t>(size, format);
   scoped_ptr<ScopedResource> resource =
       resource_pool_->AcquireResource(size, format);
 
   EXPECT_EQ(resource_bytes, resource_pool_->total_memory_usage_bytes());
   EXPECT_EQ(resource_bytes, resource_pool_->acquired_memory_usage_bytes());
   EXPECT_EQ(1u, resource_pool_->total_resource_count());
   EXPECT_EQ(1u, resource_pool_->acquired_resource_count());
   EXPECT_EQ(0u, resource_pool_->busy_resource_count());
 
   resource_pool_->ReleaseResource(resource.Pass(), 0u);
@@ skipping 64 matching lines @@
   EXPECT_EQ(1u, resource_provider_->num_resources());
 
   resource_provider_->LoseResourceForTesting(resource->id());
   resource_pool_->ReleaseResource(resource.Pass(), 0u);
   resource_pool_->CheckBusyResources(wait_if_needed);
   EXPECT_EQ(0u, resource_provider_->num_resources());
 }
 
 }  // namespace
 }  // namespace cc