Track upstream changes.

Rebase Register message patch after recent chromium changes.

Effecting CL: https://chromiumcodereview.appspot.com/23513055