Fix renames missed in r159600.

ensure_cleanly_tracking_remote_master is used from rebaseline-o-matic.

TBR=dpranke@chromium.org

Review URL: https://codereview.chromium.org/29693003

git-svn-id: svn://svn.chromium.org/blink/trunk@159987 bbb929c8-8fbe-4397-9dbb-9b2b20218538