Chromium change: https://source.chromium.org/chromium/chromium/src/+/8607f4c52155209d87fe2beb46c680bafcb68d13 Split SearchActivityUtils part 2: isolate Client logic (and tests). There's no functional changes. The code is simply moved around. Even static method continue to be static to simplify review. Bug: 329663295