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: dd90618784b6a4b323ea0c23a071cb1c9e6f2ac7@67479 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser