Generalize layer mirroring for phantom windows

ui/compositor/layer_owner_unittest.cc

Index: ui/compositor/layer_owner_unittest.cc
diff --git a/ui/compositor/layer_owner_unittest.cc b/ui/compositor/layer_owner_unittest.cc
index cdffd2a5aca1c1c786bf0a74e91e8e770a49d707..65392650631093831ca2bb9469134d63b2ffb7eb 100644
--- a/ui/compositor/layer_owner_unittest.cc
+++ b/ui/compositor/layer_owner_unittest.cc
@@ -87,13 +87,13 @@ void LayerOwnerTestWithCompositor::TearDown() {
 
 TEST(LayerOwnerTest, RecreateLayerHonorsAnimationTargets) {
   LayerOwner owner;
-  Layer* layer = new Layer(LAYER_SOLID_COLOR);
+  owner.SetLayer(base::MakeUnique<Layer>(LAYER_SOLID_COLOR));
+
+  Layer* layer = owner.layer();
   layer->SetVisible(true);
   layer->SetOpacity(1.0f);
   layer->SetColor(SK_ColorRED);
 
-  owner.SetLayer(layer);
-
   ScopedLayerAnimationSettings settings(layer->GetAnimator());
   layer->SetVisible(false);
   layer->SetOpacity(0.0f);
@@ -114,8 +114,8 @@ TEST(LayerOwnerTest, RecreateLayerHonorsAnimationTargets) {
 TEST(LayerOwnerTest, RecreateLayerSolidColorWithChangedCCLayerHonorsTargets) {
   SkColor transparent = SK_ColorTRANSPARENT;
   LayerOwner owner;
-  Layer* layer = new Layer(LAYER_SOLID_COLOR);
-  owner.SetLayer(layer);
+  owner.SetLayer(base::MakeUnique<Layer>(LAYER_SOLID_COLOR));
+  Layer* layer = owner.layer();
   layer->SetFillsBoundsOpaquely(false);
   layer->SetColor(transparent);
   // Changing the backing layer takes LAYER_SOLID_COLOR off of the normal layer
@@ -134,8 +134,7 @@ TEST(LayerOwnerTest, RecreateLayerSolidColorWithChangedCCLayerHonorsTargets) {
 
 TEST(LayerOwnerTest, RecreateRootLayerWithNullCompositor) {
   LayerOwner owner;
-  Layer* layer = new Layer;
-  owner.SetLayer(layer);
+  owner.SetLayer(base::MakeUnique<Layer>());
 
   std::unique_ptr<Layer> layer_copy = owner.RecreateLayer();
 
@@ -145,8 +144,8 @@ TEST(LayerOwnerTest, RecreateRootLayerWithNullCompositor) {
 
 TEST(LayerOwnerTest, InvertPropertyRemainSameWithRecreateLayer) {
   LayerOwner owner;
-  Layer* layer = new Layer;
-  owner.SetLayer(layer);
+  owner.SetLayer(base::MakeUnique<Layer>());
+  Layer* layer = owner.layer();
 
   layer->SetLayerInverted(true);
   std::unique_ptr<Layer> old_layer1 = owner.RecreateLayer();
@@ -159,8 +158,8 @@ TEST(LayerOwnerTest, InvertPropertyRemainSameWithRecreateLayer) {
 
 TEST(LayerOwnerTest, RecreateLayerWithTransform) {
   LayerOwner owner;
-  Layer* layer = new Layer;
-  owner.SetLayer(layer);
+  owner.SetLayer(base::MakeUnique<Layer>());
+  Layer* layer = owner.layer();
 
   gfx::Transform transform;
   transform.Scale(2, 1);
@@ -184,9 +183,8 @@ TEST(LayerOwnerTest, RecreateLayerWithTransform) {
 
 TEST_F(LayerOwnerTestWithCompositor, RecreateRootLayerWithCompositor) {
   LayerOwner owner;
-  Layer* layer = new Layer;
-  owner.SetLayer(layer);
-
+  owner.SetLayer(base::MakeUnique<Layer>());
+  Layer* layer = owner.layer();
   compositor()->SetRootLayer(layer);
 
   std::unique_ptr<Layer> layer_copy = owner.RecreateLayer();
@@ -201,8 +199,8 @@ TEST_F(LayerOwnerTestWithCompositor, RecreateRootLayerWithCompositor) {
 // of animations being cancelled.
 TEST_F(LayerOwnerTestWithCompositor, RecreateRootLayerDuringAnimation) {
   LayerOwner owner;
-  Layer* layer = new Layer;
-  owner.SetLayer(layer);
+  owner.SetLayer(base::MakeUnique<Layer>());
+  Layer* layer = owner.layer();
   compositor()->SetRootLayer(layer);
 
   std::unique_ptr<Layer> child(new Layer);
@@ -236,8 +234,8 @@ TEST_F(LayerOwnerTestWithCompositor, RecreateNonRootLayerDuringAnimation) {
   compositor()->SetRootLayer(root_layer.get());
 
   LayerOwner owner;
-  Layer* layer = new Layer;
-  owner.SetLayer(layer);
+  owner.SetLayer(base::MakeUnique<Layer>());
+  Layer* layer = owner.layer();
   root_layer->Add(layer);
 
   std::unique_ptr<Layer> child(new Layer);
@@ -270,8 +268,8 @@ TEST_F(LayerOwnerTestWithCompositor, DetachTimelineOnAnimatorDeletion) {
   compositor()->SetRootLayer(root_layer.get());
 
   LayerOwnerForTesting owner;
-  Layer* layer = new Layer;
-  owner.SetLayer(layer);
+  owner.SetLayer(base::MakeUnique<Layer>());
+  Layer* layer = owner.layer();
   layer->SetOpacity(0.5f);
   root_layer->Add(layer);
 
@@ -293,8 +291,8 @@ TEST_F(LayerOwnerTestWithCompositor,
   compositor()->SetRootLayer(root_layer.get());
 
   LayerOwner owner;
-  Layer* layer = new Layer;
-  owner.SetLayer(layer);
+  owner.SetLayer(base::MakeUnique<Layer>());
+  Layer* layer = owner.layer();
   root_layer->Add(layer);
 
   layer->SetOpacity(0.5f);