GitLab

Fixes some

  [chromium-style] WeakPtrFactory members which refer to their outer class must
  be the last member in the outer class definition.

warnings and also makes the code more correct.

BUG=303818,467287

Review URL: https://codereview.chromium.org/1107353003

Cr-Commit-Position: refs/heads/master@{#327374}