GitLab

1 - fix a crash
2 - remove an ifdef that's no longer required

BUG=134929

Review URL: https://chromiumcodereview.appspot.com/10855087

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151108 0039d316-1c4b-4281-b951-d872f2087c98