Fix stale compositor references from ui::Layer

views/view_unittest.cc

 // Copyright (c) 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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 2547 matching lines @@
 #if !defined(USE_AURA)
 // This test assumes a particular layer hierarchy that isn't valid for aura.
 // Ensures the RootView has a layer and its set up correctly.
 TEST_F(ViewLayerTest, RootState) {
   ui::Layer* layer = widget()->GetRootView()->layer();
   ASSERT_TRUE(layer);
   EXPECT_FALSE(layer->parent());
   EXPECT_EQ(0u, layer->children().size());
   EXPECT_FALSE(layer->transform().HasChange());
   EXPECT_EQ(widget()->GetRootView()->bounds(), layer->bounds());
-  EXPECT_TRUE(layer->compositor() != NULL);
+  EXPECT_TRUE(layer->GetCompositor() != NULL);
 }
 
 // Verifies that the complete bounds of a texture are updated if the texture
 // needs to be refreshed and paint with a clip is invoked.
 // This test invokes OnNativeWidgetPaintAccelerated, which is not used by aura.
 TEST_F(ViewLayerTest, PaintAll) {
   View* view = widget()->GetRootView();
   ui::Layer* layer = GetRootLayer();
   view->SetBounds(0, 0, 200, 200);
   widget()->OnNativeWidgetPaintAccelerated(gfx::Rect(0, 0, 1, 1));
@@ skipping 528 matching lines @@
   ScrambleTree(content);
   EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer()));
 
   ScrambleTree(content);
   EXPECT_TRUE(ViewAndLayerTreeAreConsistent(content, content->layer()));
 }
 
 #endif  // VIEWS_COMPOSITOR
 
 }  // namespace views