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

cc/occlusion_tracker_unittest.cc

 // Copyright 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 "cc/occlusion_tracker.h"
 
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
 
 #include "cc/layer.h"
@@ skipping 116 matching lines @@
     typedef OcclusionTracker OcclusionTrackerType;
 
     static LayerPtrType createLayer()
     {
         return Layer::create();
     }
     static ContentLayerPtrType createContentLayer() { return make_scoped_refptr(new ContentLayerType()); }
 
     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)
     {
         layer = NULL;
     }
 };
 
 struct OcclusionTrackerTestImplThreadTypes {
     typedef LayerImpl LayerType;
@@ skipping 2920 matching lines @@
 
         EXPECT_EQ(gfx::Rect(gfx::Point(), trackingSize).ToString(), occlusion.occlusionInScreenSpace().ToString());
         EXPECT_EQ(gfx::Rect(gfx::Point(), trackingSize).ToString(), occlusion.occlusionInTargetSurface().ToString());
     }
 };
 
 ALL_OCCLUSIONTRACKER_TEST(OcclusionTrackerTestMinimumTrackingSize);
 
 }  // namespace
 }  // namespace cc