Preparing cc for the removal of scoped_refptr::release()

cc/occlusion_tracker_unittest.cc

Index: cc/occlusion_tracker_unittest.cc
diff --git a/cc/occlusion_tracker_unittest.cc b/cc/occlusion_tracker_unittest.cc
index d87b82c1e164650840015c945762f834e97c0567..a73772c16be3955c6ac9aedc899ca462d6e44b3b 100644
--- a/cc/occlusion_tracker_unittest.cc
+++ b/cc/occlusion_tracker_unittest.cc
@@ -134,12 +134,16 @@ struct OcclusionTrackerTestMainThreadTypes {
 
     static LayerPtrType passLayerPtr(ContentLayerPtrType& layer)
     {
-        return layer.release();
+        LayerPtrType ref(layer);
+        layer = NULL;

[piman, 2012/12/06 21:07:49]

Note: Dana suggested skipping the resetting to NULL since the call sites don't
rely on it. I'm slightly biased towards this way because it's more consistent
with the previous behavior, and the impl-side versions, but I don't feel
strongly.

+        return ref;
     }
 
     static LayerPtrType passLayerPtr(LayerPtrType& layer)
     {
-        return layer.release();
+        LayerPtrType ref(layer);
+        layer = NULL;
+        return ref;
     }
 
     static void destroyLayer(LayerPtrType& layer)