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

trunk/src/cc/output/software_renderer_unittest.cc

 // Copyright 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.
 
 #include "cc/output/software_renderer.h"
 
 #include "cc/layers/quad_sink.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/software_output_device.h"
 #include "cc/quads/render_pass.h"
@@ skipping 63 matching lines @@
   scoped_ptr<FakeOutputSurface> output_surface_;
   scoped_ptr<ResourceProvider> resource_provider_;
   scoped_ptr<SoftwareRenderer> renderer_;
   gfx::Size viewport_size_;
   LayerTreeSettings settings_;
   bool should_clear_root_render_pass_;
 };
 
 TEST_F(SoftwareRendererTest, SolidColorQuad) {
   gfx::Size outer_size(100, 100);
-#if !defined(OS_ANDROID)
   int outer_pixels = outer_size.width() * outer_size.height();
-#endif
   gfx::Size inner_size(98, 98);
   gfx::Rect outer_rect(outer_size);
   gfx::Rect inner_rect(gfx::Point(1, 1), inner_size);
   set_viewport_size(outer_size);
 
   InitializeRenderer();
 
   scoped_ptr<SharedQuadState> shared_quad_state = SharedQuadState::Create();
   shared_quad_state->SetAll(
       gfx::Transform(), outer_size, outer_rect, outer_rect, false, 1.0);
@@ skipping 153 matching lines @@
   EXPECT_EQ(
       SK_ColorMAGENTA,
       pixels[smaller_rect.y() * viewport_rect.width() + smaller_rect.x()]);
   EXPECT_EQ(SK_ColorMAGENTA,
             pixels[(smaller_rect.bottom() - 1) * viewport_rect.width() +
                 smaller_rect.right() - 1]);
 }
 
 }  // namespace
 }  // namespace cc