GitLab

Looks like the code to skip the default categories, and the unit test,
were removed by accident in a merge. Restoring so the category selection
dialog works correctly.

BUG=195661

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

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