Fix indentation, and simplify the naming scheme for the storage.
Also add some missing DISALLOW_COPY_AND_ASSIGN macros.

BUG=angle:912

Change-Id: I7ac36d8185ce926999501358cec222154d9a3492
Reviewed-on: https://chromium-review.googlesource.com/249180Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>