Use scoped_ptr for this.

Change-Id: I54d0bbe460f95ada7632d7c9cbedb8a677995fd4
SwapRow() is no more!

Good riddance.  It was optimized for the old cell storage.

Change-Id: I374194fe211d5b13dd60dbb68b9511a366fb32bd