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

trunk/src/cc/trees/layer_tree_host_impl_unittest.cc

Index: trunk/src/cc/trees/layer_tree_host_impl_unittest.cc
===================================================================
--- trunk/src/cc/trees/layer_tree_host_impl_unittest.cc	(revision 191412)
+++ trunk/src/cc/trees/layer_tree_host_impl_unittest.cc	(working copy)
@@ -1579,7 +1579,6 @@
   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;
@@ -2978,6 +2977,18 @@
   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();
Property changes on: trunk/src/cc/trees/layer_tree_host_impl_unittest.cc
___________________________________________________________________
Added: svn:mergeinfo