Remove implicit conversions from scoped_refptr to T* in ui/

ui/compositor/layer_unittest.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 635 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(LayerWithNullDelegateTest);
 };
 
 TEST_F(LayerWithNullDelegateTest, EscapedDebugNames) {
   scoped_ptr<Layer> layer(CreateLayer(LAYER_NOT_DRAWN));
   std::string name = "\"\'\\/\b\f\n\r\t\n";
   layer->set_name(name);
   scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info =
     layer->TakeDebugInfo();
-  EXPECT_TRUE(!!debug_info);
+  EXPECT_TRUE(!!debug_info.get());
   std::string json;
   debug_info->AppendAsTraceFormat(&json);
   base::JSONReader json_reader;
   scoped_ptr<base::Value> debug_info_value(json_reader.ReadToValue(json));
   EXPECT_TRUE(!!debug_info_value);
   EXPECT_TRUE(debug_info_value->IsType(base::Value::TYPE_DICTIONARY));
   base::DictionaryValue* dictionary = 0;
   EXPECT_TRUE(debug_info_value->GetAsDictionary(&dictionary));
   std::string roundtrip;
   EXPECT_TRUE(dictionary->GetString("layer_name", &roundtrip));
@@ skipping 701 matching lines @@
   root->Add(child.get());
   DrawTree(root.get());
 
   scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection =
       new cc::DelegatedFrameResourceCollection;
   scoped_refptr<cc::DelegatedFrameProvider> frame_provider;
 
   // Content matches layer size.
   frame_provider = new cc::DelegatedFrameProvider(
       resource_collection.get(), MakeFrameData(gfx::Size(10, 10)));
-  child->SetShowDelegatedContent(frame_provider, gfx::Size(10, 10));
+  child->SetShowDelegatedContent(frame_provider.get(), gfx::Size(10, 10));
   EXPECT_EQ(child->cc_layer()->bounds().ToString(),
             gfx::Size(10, 10).ToString());
 
   // Content larger than layer.
   child->SetBounds(gfx::Rect(0, 0, 5, 5));
   EXPECT_EQ(child->cc_layer()->bounds().ToString(),
             gfx::Size(5, 5).ToString());
 
   // Content smaller than layer.
   child->SetBounds(gfx::Rect(0, 0, 10, 10));
   frame_provider = new cc::DelegatedFrameProvider(
       resource_collection.get(), MakeFrameData(gfx::Size(5, 5)));
-  child->SetShowDelegatedContent(frame_provider, gfx::Size(5, 5));
+  child->SetShowDelegatedContent(frame_provider.get(), gfx::Size(5, 5));
   EXPECT_EQ(child->cc_layer()->bounds().ToString(), gfx::Size(5, 5).ToString());
 
   // Hi-DPI content on low-DPI layer.
   frame_provider = new cc::DelegatedFrameProvider(
       resource_collection.get(), MakeFrameData(gfx::Size(20, 20)));
-  child->SetShowDelegatedContent(frame_provider, gfx::Size(10, 10));
+  child->SetShowDelegatedContent(frame_provider.get(), gfx::Size(10, 10));
   EXPECT_EQ(child->cc_layer()->bounds().ToString(),
             gfx::Size(10, 10).ToString());
 
   // Hi-DPI content on hi-DPI layer.
   compositor()->SetScaleAndSize(2.f, gfx::Size(1000, 1000));
   EXPECT_EQ(child->cc_layer()->bounds().ToString(),
             gfx::Size(10, 10).ToString());
 
   // Low-DPI content on hi-DPI layer.
   frame_provider = new cc::DelegatedFrameProvider(
       resource_collection.get(), MakeFrameData(gfx::Size(10, 10)));
-  child->SetShowDelegatedContent(frame_provider, gfx::Size(10, 10));
+  child->SetShowDelegatedContent(frame_provider.get(), gfx::Size(10, 10));
   EXPECT_EQ(child->cc_layer()->bounds().ToString(),
             gfx::Size(10, 10).ToString());
 }
 
 TEST_F(LayerWithDelegateTest, ExternalContent) {
   scoped_ptr<Layer> root(CreateNoTextureLayer(gfx::Rect(0, 0, 1000, 1000)));
   scoped_ptr<Layer> child(CreateLayer(LAYER_TEXTURED));
 
   child->SetBounds(gfx::Rect(0, 0, 10, 10));
   child->SetVisible(true);
   root->Add(child.get());
 
   // The layer is already showing painted content, so the cc layer won't change.
   scoped_refptr<cc::Layer> before = child->cc_layer();
   child->SetShowPaintedContent();
   EXPECT_TRUE(child->cc_layer());
-  EXPECT_EQ(before, child->cc_layer());
+  EXPECT_EQ(before.get(), child->cc_layer());
 
   scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection =
       new cc::DelegatedFrameResourceCollection;
   scoped_refptr<cc::DelegatedFrameProvider> frame_provider =
       new cc::DelegatedFrameProvider(resource_collection.get(),
                                      MakeFrameData(gfx::Size(10, 10)));
 
   // Showing delegated content changes the underlying cc layer.
   before = child->cc_layer();
-  child->SetShowDelegatedContent(frame_provider, gfx::Size(10, 10));
+  child->SetShowDelegatedContent(frame_provider.get(), gfx::Size(10, 10));
   EXPECT_TRUE(child->cc_layer());
-  EXPECT_NE(before, child->cc_layer());
+  EXPECT_NE(before.get(), child->cc_layer());
 
   // Changing to painted content should change the underlying cc layer.
   before = child->cc_layer();
   child->SetShowPaintedContent();
   EXPECT_TRUE(child->cc_layer());
-  EXPECT_NE(before, child->cc_layer());
+  EXPECT_NE(before.get(), child->cc_layer());
 }
 
 // Tests Layer::AddThreadedAnimation and Layer::RemoveThreadedAnimation.
 TEST_F(LayerWithRealCompositorTest, AddRemoveThreadedAnimations) {
   scoped_ptr<Layer> root(CreateLayer(LAYER_TEXTURED));
   scoped_ptr<Layer> l1(CreateLayer(LAYER_TEXTURED));
   scoped_ptr<Layer> l2(CreateLayer(LAYER_TEXTURED));
 
   l1->SetAnimator(LayerAnimator::CreateImplicitAnimator());
   l2->SetAnimator(LayerAnimator::CreateImplicitAnimator());
@@ skipping 175 matching lines @@
   scoped_ptr<Layer> layer(new Layer(LAYER_TEXTURED));
   gfx::Rect damage_rect(2, 1, 5, 3);
 
   FrameDamageCheckingDelegate delegate;
   layer->set_delegate(&delegate);
   scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection =
       new cc::DelegatedFrameResourceCollection;
   scoped_refptr<cc::DelegatedFrameProvider> frame_provider(
       new cc::DelegatedFrameProvider(resource_collection.get(),
                                      MakeFrameData(gfx::Size(10, 10))));
-  layer->SetShowDelegatedContent(frame_provider, gfx::Size(10, 10));
+  layer->SetShowDelegatedContent(frame_provider.get(), gfx::Size(10, 10));
 
   EXPECT_FALSE(delegate.delegated_frame_damage_called());
   layer->OnDelegatedFrameDamage(damage_rect);
   EXPECT_TRUE(delegate.delegated_frame_damage_called());
   EXPECT_EQ(damage_rect, delegate.delegated_frame_damage_rect());
 }
 
 }  // namespace ui