Rename Widget::CalculateOffsetToAncestorWithLayer() to Widget::GetLayer()

ui/views/view_unittest.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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 2876 matching lines @@
 
 class ViewLayerTest : public ViewsTestBase {
  public:
   ViewLayerTest() : widget_(NULL), old_use_acceleration_(false) {}
 
   virtual ~ViewLayerTest() {
   }
 
   // Returns the Layer used by the RootView.
   ui::Layer* GetRootLayer() {
-    ui::Layer* root_layer = NULL;
-    widget()->CalculateOffsetToAncestorWithLayer(&root_layer);
-    return root_layer;
+    return widget()->GetLayer();
   }
 
   virtual void SetUp() OVERRIDE {
     ViewTest::SetUp();
     old_use_acceleration_ = View::get_use_acceleration_when_possible();
     View::set_use_acceleration_when_possible(true);
 
     widget_ = new Widget;
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(50, 50, 200, 200);
@@ skipping 12 matching lines @@
 
  private:
   Widget* widget_;
   bool old_use_acceleration_;
 };
 
 
 TEST_F(ViewLayerTest, LayerToggling) {
   // Because we lazily create textures the calls to DrawTree are necessary to
   // ensure we trigger creation of textures.
-  ui::Layer* root_layer = NULL;
-  widget()->CalculateOffsetToAncestorWithLayer(&root_layer);
+  ui::Layer* root_layer = widget()->GetLayer();
   View* content_view = new View;
   widget()->SetContentsView(content_view);
 
   // Create v1, give it a bounds and verify everything is set up correctly.
   View* v1 = new View;
   v1->SetPaintToLayer(true);
   EXPECT_TRUE(v1->layer() != NULL);
   v1->SetBoundsRect(gfx::Rect(20, 30, 140, 150));
   content_view->AddChildView(v1);
   ASSERT_TRUE(v1->layer() != NULL);
@@ skipping 432 matching lines @@
   // Set to non default value.
   v->layer()->set_scale_content(false);
   scoped_ptr<ui::Layer> old_layer(v->RecreateLayer());
   ui::Layer* new_layer = v->layer();
   EXPECT_FALSE(new_layer->scale_content());
 }
 
 #endif  // USE_AURA
 
 }  // namespace views