bd76934452
Also rename the new implementation files and classes to remove the '2' suffix. R=brianwilkerson@google.com BUG= Review URL: https://codereview.chromium.org/1801883002 .