Remove implicit conversions from scoped_refptr to T* in cc/trees/

cc/trees/tree_synchronizer_unittest.cc

 // Copyright 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 "cc/trees/tree_synchronizer.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 598 matching lines @@
 
   scoped_refptr<Layer> layer_tree_root = Layer::Create();
   scoped_refptr<Layer> scroll_parent = Layer::Create();
   layer_tree_root->AddChild(scroll_parent);
   layer_tree_root->AddChild(Layer::Create());
   layer_tree_root->AddChild(Layer::Create());
 
   host_->SetRootLayer(layer_tree_root);
 
   // First child is the second and third child's scroll parent.
-  layer_tree_root->children()[1]->SetScrollParent(scroll_parent);
-  layer_tree_root->children()[2]->SetScrollParent(scroll_parent);
+  layer_tree_root->children()[1]->SetScrollParent(scroll_parent.get());
+  layer_tree_root->children()[2]->SetScrollParent(scroll_parent.get());
 
   scoped_ptr<LayerImpl> layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          scoped_ptr<LayerImpl>(),
                                          host_impl->active_tree());
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
   {
     SCOPED_TRACE("case one");
     ExpectTreesAreIdentical(layer_tree_root.get(),
@@ skipping 12 matching lines @@
   {
     SCOPED_TRACE("case two");
     ExpectTreesAreIdentical(layer_tree_root.get(),
                             layer_impl_tree_root.get(),
                             host_impl->active_tree());
   }
 
   // Add an additional scroll layer.
   scoped_refptr<Layer> additional_scroll_child = Layer::Create();
   layer_tree_root->AddChild(additional_scroll_child);
-  additional_scroll_child->SetScrollParent(scroll_parent);
+  additional_scroll_child->SetScrollParent(scroll_parent.get());
   layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          layer_impl_tree_root.Pass(),
                                          host_impl->active_tree());
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
   {
     SCOPED_TRACE("case three");
     ExpectTreesAreIdentical(layer_tree_root.get(),
                             layer_impl_tree_root.get(),
@@ skipping 22 matching lines @@
   scoped_refptr<Layer> clip_child1 = Layer::Create();
   scoped_refptr<Layer> clip_child2 = Layer::Create();
   layer_tree_root->AddChild(clip_parent);
   clip_parent->AddChild(intervening);
   intervening->AddChild(clip_child1);
   intervening->AddChild(clip_child2);
 
   host_->SetRootLayer(layer_tree_root);
 
   // First child is the second and third child's scroll parent.
-  clip_child1->SetClipParent(clip_parent);
-  clip_child2->SetClipParent(clip_parent);
+  clip_child1->SetClipParent(clip_parent.get());
+  clip_child2->SetClipParent(clip_parent.get());
 
   scoped_ptr<LayerImpl> layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          scoped_ptr<LayerImpl>(),
                                          host_impl->active_tree());
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_impl->active_tree());
 
   // Remove the first clip child.
   clip_child1->RemoveFromParent();
   clip_child1 = NULL;
 
   layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          layer_impl_tree_root.Pass(),
                                          host_impl->active_tree());
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_impl->active_tree());
 
   // Add an additional clip child.
   scoped_refptr<Layer> additional_clip_child = Layer::Create();
   intervening->AddChild(additional_clip_child);
-  additional_clip_child->SetClipParent(clip_parent);
+  additional_clip_child->SetClipParent(clip_parent.get());
   layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          layer_impl_tree_root.Pass(),
                                          host_impl->active_tree());
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_impl->active_tree());
 
@@ skipping 11 matching lines @@
                           host_impl->active_tree());
 
   // The clip children should have been unhooked.
   EXPECT_EQ(2u, intervening->children().size());
   EXPECT_FALSE(clip_child2->clip_parent());
   EXPECT_FALSE(additional_clip_child->clip_parent());
 }
 
 }  // namespace
 }  // namespace cc