cc: Fix BytesPerPixel issue and refactor.

cc/cc.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 423 matching lines @@
         'resources/memory_history.h',
         'resources/platform_color.h',
         'resources/release_callback.h',
         'resources/resource.h',
         'resources/resource_format.cc',
         'resources/resource_format.h',
         'resources/resource_pool.cc',
         'resources/resource_pool.h',
         'resources/resource_provider.cc',
         'resources/resource_provider.h',
+        'resources/resource_util.cc',
+        'resources/resource_util.h',
         'resources/returned_resource.h',
         'resources/scoped_resource.cc',
         'resources/scoped_resource.h',
         'resources/scoped_ui_resource.cc',
         'resources/scoped_ui_resource.h',
         'resources/shared_bitmap.cc',
         'resources/shared_bitmap.h',
         'resources/shared_bitmap_manager.h',
         'resources/single_release_callback.cc',
         'resources/single_release_callback.h',
@@ skipping 150 matching lines @@
         'surfaces/surface_resource_holder.cc',
         'surfaces/surface_resource_holder.h',
         'surfaces/surfaces_export.h',
       ],
       'includes': [
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
   ],
 }