commit 10a47461a787305890da5b8dc452093308316124
author Orin Jaworski <orinj@chromium.org> Fri Mar 22 17:26:49 2019
committer Commit Bot <commit-bot@chromium.org> Fri Mar 22 17:26:49 2019
tree 8bfe6bb650e0e3c429d0c7b03dbf97d5dc44757a
parent b5fb42b99d75790ff064e93dfa6a8d26ed5c78d3

[omnibox] Re-land 1530281 with slow unit test disabled.

This CL reverts commit 7e78ad7daa06966d1e195b133e83abd7bed56637 , called
"Revert "[omnibox] Load Pedal concept matching data from JSON resource""

It also disables the unit test that caused initial revert.  The test
was passing, but taking too long because of the inefficient re2-based
implementation of EraseWords.  That code was experimental, behind a
flag, and is already replaced with a technique that executes orders of
magnitude faster.  So the test will be re-enabled very soon.

Bug: 893183, 944377
Change-Id: I3e313246b2d15f4c5ab4fa3725695f2707317607
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1534193
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Tommy Li <tommycli@chromium.org>
Commit-Queue: Orin Jaworski <orinj@chromium.org>
Auto-Submit: Orin Jaworski <orinj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#643418}