Fixes some asserts in compositor_unittests

ui/gfx/compositor/layer_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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ skipping 1088 matching lines @@
   for (int x = 0; is_all_red && x < 500; x++)
     for (int y = 0; is_all_red && y < 500; y++)
       is_all_red = is_all_red && (bitmap.getColor(x, y) == SK_ColorRED);
 
   EXPECT_TRUE(is_all_red);
 }
 
 // Checks the logic around Compositor::SetRootLayer and Layer::SetCompositor.
 TEST_F(LayerWithRealCompositorTest, MAYBE_SetRootLayer) {
   Compositor* compositor = GetCompositor();
-  Layer l1;
-  EXPECT_EQ(NULL, l1.GetCompositor());
+  scoped_ptr<Layer> l1(CreateColorLayer(SK_ColorRED,
+                                        gfx::Rect(20, 20, 400, 400)));
+  scoped_ptr<Layer> l2(CreateColorLayer(SK_ColorBLUE,
+                                        gfx::Rect(10, 10, 350, 350)));
 
-  Layer l2;
-  EXPECT_EQ(NULL, l2.GetCompositor());
+  EXPECT_EQ(NULL, l1->GetCompositor());
+  EXPECT_EQ(NULL, l2->GetCompositor());
 
-  compositor->SetRootLayer(&l1);
-  EXPECT_EQ(compositor, l1.GetCompositor());
+  compositor->SetRootLayer(l1.get());
+  EXPECT_EQ(compositor, l1->GetCompositor());
 
-  l1.Add(&l2);
-  EXPECT_EQ(compositor, l2.GetCompositor());
+  l1->Add(l2.get());
+  EXPECT_EQ(compositor, l2->GetCompositor());
 
-  l1.Remove(&l2);
-  EXPECT_EQ(NULL, l2.GetCompositor());
+  l1->Remove(l2.get());
+  EXPECT_EQ(NULL, l2->GetCompositor());
 
-  l1.Add(&l2);
-  EXPECT_EQ(compositor, l2.GetCompositor());
+  l1->Add(l2.get());
+  EXPECT_EQ(compositor, l2->GetCompositor());
 
   compositor->SetRootLayer(NULL);
-  EXPECT_EQ(NULL, l1.GetCompositor());
-  EXPECT_EQ(NULL, l2.GetCompositor());
+  EXPECT_EQ(NULL, l1->GetCompositor());
+  EXPECT_EQ(NULL, l2->GetCompositor());
 }
 
 // Checks that compositor observers are notified when:
 // - DrawTree is called,
 // - After ScheduleDraw is called, or
 // - Whenever SetBounds, SetOpacity or SetTransform are called.
 // TODO(vollick): could be reorganized into compositor_unittest.cc
 TEST_F(LayerWithRealCompositorTest, MAYBE_CompositorObservers) {
   scoped_ptr<Layer> l1(CreateColorLayer(SK_ColorRED,
                                         gfx::Rect(20, 20, 400, 400)));
@@ skipping 135 matching lines @@
   l0->Add(l11.get());
   DrawTree(l0.get());
   SkBitmap bitmap;
   ASSERT_TRUE(GetCompositor()->ReadPixels(&bitmap));
   ASSERT_FALSE(bitmap.empty());
   // WritePNGFile(bitmap, ref_img);
   EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img));
 }
 
 } // namespace ui