cc: Remove separate x/y raster scales.

cc/tiles/picture_layer_tiling_set_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/tiles/picture_layer_tiling_set.h"
 
 #include <map>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
@@ skipping 259 matching lines @@
 
     Region remaining(content_rect);
     PictureLayerTilingSet::CoverageIterator iter(
         set.get(), max_contents_scale, content_rect, ideal_contents_scale);
     for (; iter; ++iter) {
       gfx::Rect geometry_rect = iter.geometry_rect();
       EXPECT_TRUE(content_rect.Contains(geometry_rect));
       ASSERT_TRUE(remaining.Contains(geometry_rect));
       remaining.Subtract(geometry_rect);
 
-      float scale = iter.CurrentTiling()->contents_scale_key();
+      float scale = iter.CurrentTiling()->contents_scale();
       EXPECT_EQ(expected_scale, scale);
 
       if (num_tilings)
         EXPECT_TRUE(*iter);
       else
         EXPECT_FALSE(*iter);
     }
     EXPECT_TRUE(remaining.IsEmpty());
   }
 };
@@ skipping 742 matching lines @@
   // UpdateTilePriorities for pending set gets called during UDP in commit.
   EXPECT_TRUE(pending_set->UpdateTilePriorities(viewport, 1.f, time,
                                                 Occlusion(), true));
   // No changes for active set until activation.
   EXPECT_FALSE(
       active_set->UpdateTilePriorities(viewport, 1.f, time, Occlusion(), true));
 }
 
 }  // namespace
 }  // namespace cc