Remove leftover conflict markers from proxy_service_unittest.cc

Remove leftover conflict markers from proxy_service_unittest.cc

These were commented out instead of deleted after the conflict
was resolved in http://crrev.com/426450

BUG=478934
Review-Url: https://codereview.chromium.org/2644463008
Cr-Commit-Position: refs/heads/master@{#444984}
Committed: https://chromium.googlesource.com/chromium/src/+/5bd3b4bb359c6378ffcb3c31d7ad2166ad09534f

[aelias_OOO_until_Jul13, 2017-01-20 03:14:52]

The CQ bit was checked by aelias@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-20 03:15:11]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[aelias_OOO_until_Jul13, 2017-01-20 03:16:13]

aelias@chromium.org changed reviewers:
+ davidben@chromium.org

[aelias_OOO_until_Jul13, 2017-01-20 03:16:25]

Hi davidben@, PTAL.

[commit-bot: I haz the power, 2017-01-20 03:58:39]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-20 03:58:40]

Dry run: This issue passed the CQ dry run.

[davidben, 2017-01-20 04:35:46]

lgtm

[aelias_OOO_until_Jul13, 2017-01-20 04:46:37]

The CQ bit was checked by aelias@chromium.org

[commit-bot: I haz the power, 2017-01-20 04:46:53]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-20 04:50:30]

CQ is committing da patch.

Bot data: {"patchset_id": 1, "attempt_start_ts": 1484887597535670, "parent_rev":
"1174657e747a79abfc910fdd863552562ccfc8da", "commit_rev":
"5bd3b4bb359c6378ffcb3c31d7ad2166ad09534f"}

[commit-bot: I haz the power, 2017-01-20 04:51:21]

Description was changed from

==========
Remove leftover conflict markers from proxy_service_unittest.cc

These were commented out instead of deleted after the conflict
was resolved in http://crrev.com/426450

BUG=478934
==========

to

==========
Remove leftover conflict markers from proxy_service_unittest.cc

These were commented out instead of deleted after the conflict
was resolved in http://crrev.com/426450

BUG=478934

Review-Url: https://codereview.chromium.org/2644463008
Cr-Commit-Position: refs/heads/master@{#444984}
Committed:
https://chromium.googlesource.com/chromium/src/+/5bd3b4bb359c6378ffcb3c31d7ad...
==========

[commit-bot: I haz the power, 2017-01-20 04:51:22]

Committed patchset #1 (id:1) as
https://chromium.googlesource.com/chromium/src/+/5bd3b4bb359c6378ffcb3c31d7ad...