Update scheme text color in Omnibox only in non-default Security Levels

Update scheme text color in Omnibox only in non-default Security Levels

A recent refactoring dropped a test from the conditional which caused
the Omnibox to paint the scheme text in black in cases where it should
not. Restore the conditional so that the Omnibox only colors the scheme
text in the correct scenarios.

BUG=699222
TEST=Type about:blank in the omnibox and hit enter. "about:" should be
grey and "blank" should be black

Review-Url: https://codereview.chromium.org/2734783007
Cr-Commit-Position: refs/heads/master@{#455783}
(cherry picked from commit f079e7398cefd26400234c38a83630d2f5730969)

Review-Url: https://codereview.chromium.org/2742033002 .
Cr-Commit-Position: refs/branch-heads/3029@{#112}
Cr-Branched-From: 939b32ee5ba05c396eef3fd992822fcca9a2e262-refs/heads/master@{#454471}
Committed: https://chromium.googlesource.com/chromium/src/+/df154b0f0305d236a6d71a63a6a120bfe55b3bec

[elawrence, 2017-03-10 17:44:11]

Description was changed from

==========
Update scheme text color in Omnibox only in non-default Security Levels

A recent refactoring dropped a test from the conditional which caused
the Omnibox to paint the scheme text in black in cases where it should
not. Restore the conditional so that the Omnibox only colors the scheme
text in the correct scenarios.

BUG=699222
TEST=Type about:blank in the omnibox and hit enter. "about:" should be
grey and "blank" should be black

Review-Url: https://codereview.chromium.org/2734783007
Cr-Commit-Position: refs/heads/master@{#455783}
(cherry picked from commit f079e7398cefd26400234c38a83630d2f5730969)
==========

to

==========
Update scheme text color in Omnibox only in non-default Security Levels

A recent refactoring dropped a test from the conditional which caused
the Omnibox to paint the scheme text in black in cases where it should
not. Restore the conditional so that the Omnibox only colors the scheme
text in the correct scenarios.

BUG=699222
TEST=Type about:blank in the omnibox and hit enter. "about:" should be
grey and "blank" should be black

Review-Url: https://codereview.chromium.org/2734783007
Cr-Commit-Position: refs/heads/master@{#455783}
(cherry picked from commit f079e7398cefd26400234c38a83630d2f5730969)

Review-Url: https://codereview.chromium.org/2742033002 .
Cr-Commit-Position: refs/branch-heads/3029@{#112}
Cr-Branched-From:
939b32ee5ba05c396eef3fd992822fcca9a2e262-refs/heads/master@{#454471}
Committed:
https://chromium.googlesource.com/chromium/src/+/df154b0f0305d236a6d71a63a6a1...
==========

[elawrence, 2017-03-10 17:44:12]

Committed patchset #1 (id:1) manually as
df154b0f0305d236a6d71a63a6a120bfe55b3bec.