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

cc/trees/layer_tree_host_impl_unittest.cc

Index: cc/trees/layer_tree_host_impl_unittest.cc
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 1e6299995783b3f12bc2838517e1ad97f7783360..737ef2a2ce7507c8f67e616126f60a9869b3753a 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -1579,6 +1579,7 @@ TEST_F(LayerTreeHostImplTest, PageScaleDeltaAppliedToRootScrollLayerOnly) {
   gfx::Size surface_size(10, 10);
   float default_page_scale = 1.f;
   gfx::Transform default_page_scale_matrix;
+  default_page_scale_matrix.Scale(default_page_scale, default_page_scale);
 
   float new_page_scale = 2.f;
   gfx::Transform new_page_scale_matrix;
@@ -2977,18 +2978,6 @@ class TrackingWebGraphicsContext3D : public TestWebGraphicsContext3D {
   unsigned num_textures_;
 };
 
-static unsigned CreateResourceId(ResourceProvider* resource_provider) {
-  return resource_provider->CreateResource(
-      gfx::Size(20, 12),
-      resource_provider->best_texture_format(),
-      ResourceProvider::TextureUsageAny);
-}
-
-static unsigned CreateTextureId(ResourceProvider* resource_provider) {
-  return ResourceProvider::ScopedReadLockGL(
-      resource_provider, CreateResourceId(resource_provider)).texture_id();
-}
-
 TEST_F(LayerTreeHostImplTest, LayersFreeTextures) {
   scoped_ptr<TestWebGraphicsContext3D> context =
       TestWebGraphicsContext3D::Create();