tree 50499b6687d784cdcf571f5b6c5885d5f75be334
parent aa56b7287426ffc476843ad2ffab9eb70709e4ab
author Elliott Hughes <enh@google.com> 1327616075 -0800
committer Elliott Hughes <enh@google.com> 1327619695 -0800

Fix test 046.

Looks like a recent change put us on an untested code path, and we need
to start distinguishing callers' intentions. We can also remove some
unnecessary duplication.

Change-Id: I950139e6fdc8656b89d8e1520e8b50f681c7f7b2