GitLab

* Fix a couple of incorrect include guards.
* Use "return std::make_unique<T>(...)" instead of
  "return std::unique_ptr<T>(...)" because the latter is banned by a
  presubmit.

https://source.chromium.org/chromium/chromium/src/+/master:PRESUBMIT.py;drc=9c1f87c53ca0d29afdd5763b50cb26341ba1fd64;l=2596

I just noticed these incidentally while investigating another issue.

Bug: none
Change-Id: Id5ea994517ff41641a724cf0832da80f8ac7b680
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2530900
Commit-Queue: James Cook <jamescook@chromium.org>
Auto-Submit: James Cook <jamescook@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826401}