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

cc/resources/content_layer_updater.cc

 // Copyright 2011 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/resources/content_layer_updater.h"
 
 #include "base/debug/trace_event.h"
 #include "base/time.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
 #include "cc/resources/layer_painter.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkScalar.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/rect_f.h"
 
 namespace cc {
 
 ContentLayerUpdater::ContentLayerUpdater(
     scoped_ptr<LayerPainter> painter,
     RenderingStatsInstrumentation* stats_instrumentation)
-    : painter_(painter.Pass()),
-      rendering_stats_instrumentation_(stats_instrumentation) {}
+    : rendering_stats_instrumentation_(stats_instrumentation),
+      painter_(painter.Pass()) {}
 
 ContentLayerUpdater::~ContentLayerUpdater() {}
 
 void ContentLayerUpdater::PaintContents(SkCanvas* canvas,
                                         gfx::Rect content_rect,
                                         float contents_width_scale,
                                         float contents_height_scale,
                                         gfx::Rect* resulting_opaque_rect,
                                         RenderingStats* stats) {
   TRACE_EVENT0("cc", "ContentLayerUpdater::PaintContents");
@@ skipping 32 matching lines @@
   canvas->restore();
 
   gfx::RectF opaque_content_rect = gfx::ScaleRect(
       opaque_layer_rect, contents_width_scale, contents_height_scale);
   *resulting_opaque_rect = gfx::ToEnclosedRect(opaque_content_rect);
 
   content_rect_ = content_rect;
 }
 
 }  // namespace cc