Clean up ui<->cc layers interface.

ui/compositor/dip_util.cc

 // 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.
 
 #include "ui/compositor/dip_util.h"
 
 #include "base/command_line.h"
 #include "cc/layers/layer.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_switches.h"
@@ skipping 85 matching lines @@
   layer_to_snap->SetSubpixelPositionOffset(fudge);
 #if DCHECK_IS_ON()
   gfx::Point layer_offset;
   gfx::PointF origin;
   Layer::ConvertPointToLayer(
       layer_to_snap->parent(), snapped_layer, &layer_offset);
   if (layer_to_snap->GetAnimator()->is_animating()) {
     origin = layer_to_snap->GetTargetBounds().origin() +
              layer_to_snap->subpixel_position_offset();
   } else {
-    cc::Layer* cc_layer = layer_to_snap->cc_layer();
-    origin = cc_layer->position();
+    origin = layer_to_snap->position();
   }
   CheckSnapped((layer_offset.x() + origin.x()) * scale_factor);
   CheckSnapped((layer_offset.y() + origin.y()) * scale_factor);
 #endif
 }
 
 }  // namespace ui