Remove use of C++11 feature (auto keyword).

BUG=452

Review URL: https://codereview.appspot.com/11953043
2 files changed