Fix remaining incompatibilities between scoped_ptr and unique_ptr.

cc/layers/layer_impl.h

Index: cc/layers/layer_impl.h
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index 48e9529f3d37a21087bf325dd567c92cd0efbc48..c9cfc3e62cc75816b33d92d77ef775145239b6ea 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -244,8 +244,8 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
   const LayerImpl* replica_layer() const { return replica_layer_.get(); }
   scoped_ptr<LayerImpl> TakeReplicaLayer();
 
-  bool has_mask() const { return mask_layer_; }
-  bool has_replica() const { return replica_layer_; }
+  bool has_mask() const { return !!mask_layer_; }
+  bool has_replica() const { return !!replica_layer_; }
   bool replica_has_mask() const {
     return replica_layer_ && (mask_layer_ || replica_layer_->mask_layer_);
   }