bad merge, no need to delete a scoped_ptr
bad merge, no need to delete a scoped_ptr

TBR=aa

Review URL: http://codereview.chromium.org/13252


git-svn-id: http://src.chromium.org/svn/trunk/src@6528 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Former-commit-id: eaa7ca3dba1edc0e0efdad831164c002aa9e13da
meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser