Revert of Fix TemplateUrl::MatchesData comparison of search_terms_replacement_key (patchset #2 id:2…

Revert of Fix TemplateUrl::MatchesData comparison of search_terms_replacement_key (patchset #2 id:20001 of https://codereview.chromium.org/2516963002/ )

Reason for revert:
Part 2 of 2: Reverting change that caused bug 680197

Original issue's description:
> Fix TemplateUrl::MatchesData comparison of search_terms_replacement_key
>
> Current TemplateUrl constructor performs replacement of
> search_terms_replacement_key field after initialization from
> TemplateURLData. This replacement was not handled correctly in
> TemplateUrl::MatchesData function. As result, TemplateUrl created from
> TemplateUrlData for google engine could not be matched to its own
> source data.
>
> R=pkasting@chromium.org
>
> Committed: https://crrev.com/58606e51c44b74f89cf5fbbb370a78731acd942a
> Cr-Commit-Position: refs/heads/master@{#433504}

TBR=treib@chromium.org,a-v-y@yandex-team.ru

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

BUG=

Review-Url: https://codereview.chromium.org/2672653002 .
Cr-Commit-Position: refs/branch-heads/2987@{#261}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Committed: https://chromium.googlesource.com/chromium/src/+/2d92c1ca20824173c833d947c1350f918bf1b977

[Peter Kasting, 2017-02-02 01:31:54]

Description was changed from

==========
Revert of Fix TemplateUrl::MatchesData comparison of
search_terms_replacement_key (patchset #2 id:20001 of
https://codereview.chromium.org/2516963002/ )

Reason for revert:
Part 2 of 2: Reverting change that caused bug 680197

Original issue's description:
> Fix TemplateUrl::MatchesData comparison of search_terms_replacement_key
>
> Current TemplateUrl constructor performs replacement of
> search_terms_replacement_key field after initialization from
> TemplateURLData. This replacement was not handled correctly in
> TemplateUrl::MatchesData function. As result, TemplateUrl created from
> TemplateUrlData for google engine could not be matched to its own
> source data.
>
> R=pkasting@chromium.org
>
> Committed: https://crrev.com/58606e51c44b74f89cf5fbbb370a78731acd942a
> Cr-Commit-Position: refs/heads/master@{#433504}

TBR=treib@chromium.org,a-v-y@yandex-team.ru

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

BUG=
==========

to

==========
Revert of Fix TemplateUrl::MatchesData comparison of
search_terms_replacement_key (patchset #2 id:20001 of
https://codereview.chromium.org/2516963002/ )

Reason for revert:
Part 2 of 2: Reverting change that caused bug 680197

Original issue's description:
> Fix TemplateUrl::MatchesData comparison of search_terms_replacement_key
>
> Current TemplateUrl constructor performs replacement of
> search_terms_replacement_key field after initialization from
> TemplateURLData. This replacement was not handled correctly in
> TemplateUrl::MatchesData function. As result, TemplateUrl created from
> TemplateUrlData for google engine could not be matched to its own
> source data.
>
> R=pkasting@chromium.org
>
> Committed: https://crrev.com/58606e51c44b74f89cf5fbbb370a78731acd942a
> Cr-Commit-Position: refs/heads/master@{#433504}

TBR=treib@chromium.org,a-v-y@yandex-team.ru

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

BUG=

Review-Url: https://codereview.chromium.org/2672653002 .
Cr-Commit-Position: refs/branch-heads/2987@{#261}
Cr-Branched-From:
ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Committed:
https://chromium.googlesource.com/chromium/src/+/2d92c1ca20824173c833d947c135...
==========

[Peter Kasting, 2017-02-02 01:31:56]

Committed patchset #1 (id:1) manually as
2d92c1ca20824173c833d947c1350f918bf1b977.