Move some code around to make another diff cleaner

TBR=reed@google.com

Review URL: https://codereview.chromium.org/1403293004
1 file changed