Fix merge conflict in bookmark_node_data.h
Fix merge conflict in bookmark_node_data.h

BUG=BUG=37891
TEST=trybots
TBR=mrossetti@chromium.org

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

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

Former-commit-id: 5a7a7224ed947a93fbd1699e91aa12d03c31a14b
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