This fixes a compilation error on Clang due to conflicting declarations (struct vs class) in multiple header files. BUG=http://crbug.com/236272 R=jia.shao.peng@gmail.com Review URL: https://codereview.appspot.com/9259043