cc: Make LayerTreeHost a protected Layer member.

cc/layers/ui_resource_layer_unittest.cc

 // Copyright 2013 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/layers/ui_resource_layer.h"
 
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_ui_resource.h"
 #include "cc/test/fake_layer_tree_host.h"
@@ skipping 53 matching lines @@
   std::unique_ptr<FakeLayerTreeHost> layer_tree_host_;
 };
 
 TEST_F(UIResourceLayerTest, SetBitmap) {
   scoped_refptr<UIResourceLayer> test_layer = TestUIResourceLayer::Create();
   ASSERT_TRUE(test_layer.get());
   test_layer->SetBounds(gfx::Size(100, 100));
 
   layer_tree_host_->SetRootLayer(test_layer);
   Mock::VerifyAndClearExpectations(layer_tree_host_.get());
-  EXPECT_EQ(test_layer->layer_tree_host(), layer_tree_host_.get());
+  EXPECT_EQ(test_layer->GetLayerTreeHostForTesting(), layer_tree_host_.get());
 
   test_layer->SavePaintProperties();
   test_layer->Update();
 
   EXPECT_FALSE(test_layer->DrawsContent());
 
   SkBitmap bitmap;
   bitmap.allocN32Pixels(10, 10);
   bitmap.setImmutable();
 
   test_layer->SetBitmap(bitmap);
   test_layer->Update();
 
   EXPECT_TRUE(test_layer->DrawsContent());
 }
 
 TEST_F(UIResourceLayerTest, SetUIResourceId) {
   scoped_refptr<TestUIResourceLayer> test_layer = TestUIResourceLayer::Create();
   ASSERT_TRUE(test_layer.get());
   test_layer->SetBounds(gfx::Size(100, 100));
 
   layer_tree_host_->SetRootLayer(test_layer);
   Mock::VerifyAndClearExpectations(layer_tree_host_.get());
-  EXPECT_EQ(test_layer->layer_tree_host(), layer_tree_host_.get());
+  EXPECT_EQ(test_layer->GetLayerTreeHostForTesting(), layer_tree_host_.get());
 
   test_layer->SavePaintProperties();
   test_layer->Update();
 
   EXPECT_FALSE(test_layer->DrawsContent());
 
   bool is_opaque = false;
   std::unique_ptr<ScopedUIResource> resource =
       ScopedUIResource::Create(layer_tree_host_->GetUIResourceManager(),
                                UIResourceBitmap(gfx::Size(10, 10), is_opaque));
@@ skipping 26 matching lines @@
 
   test_layer->SetBitmap(bitmap);
   ASSERT_FALSE(bitmap.pixelRef()->unique());
 
   test_layer->SetUIResourceId(0);
   EXPECT_TRUE(bitmap.pixelRef()->unique());
 }
 
 }  // namespace
 }  // namespace cc