cc: Fix BytesPerPixel issue and refactor.

cc/resources/resource_pool_unittest.cc

Index: cc/resources/resource_pool_unittest.cc
diff --git a/cc/resources/resource_pool_unittest.cc b/cc/resources/resource_pool_unittest.cc
index 96e7591ab8c3bf5a423f5d1b7258d8b667076655..035b19e3cf7a87d8258b8ed44b710fbc35dfa94f 100644
--- a/cc/resources/resource_pool_unittest.cc
+++ b/cc/resources/resource_pool_unittest.cc
@@ -4,6 +4,7 @@
 
 #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"
@@ -54,7 +55,8 @@ TEST_F(ResourcePoolTest, AccountingSingleResource) {
 
   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);