)]}' { "commit": "e7804de16a79ad3541dbbc89eacfcc97eafc00fc", "tree": "ad68eff1d960b8aa7d7d199eb04ebc4e65d55ba8", "parents": [ "c692b9fc3f0c5d42643bdaca6b83236b75f60e65" ], "author": { "name": "Orin Jaworski", "email": "orinj@chromium.org", "time": "Wed Jan 30 23:18:31 2019" }, "committer": { "name": "Orin Jaworski", "email": "orinj@chromium.org", "time": "Wed Jan 30 23:18:31 2019" }, "message": "Preserve vector order in RemoveDuplicatePrepopulateIDs\n\nThis CL is the union of 2 other CLs. The purpose of this CL is\nto ensure one clean merge to the M73 branch. The 2 source CLs are:\n\n----- https://crrev.com/c/1428939\nPreserve vector order in RemoveDuplicatePrepopulateIDs\n\nTemplate URLs with nonzero prepopulate_id were implicitly\nreordered by RemoveDuplicatePrepopulateIDs, though relative\norder was preserved for elements with zero prepopulate_id.\nThis CL adjusts the algorithm to output the selected\nrepresentatives for each prepopulate_id in order of first\nappearance in the original template_urls vector, stabilizing\nthe overall order (instead of partitioning as it did before).\n\nBug: 924268\nChange-Id: Ic885065cbf20398dfff723a85aff35141e0cb9a5\nReviewed-on: https://chromium-review.googlesource.com/c/1428939\nCommit-Queue: Orin Jaworski \u003corinj@chromium.org\u003e\nReviewed-by: Vasilii Sukhanov \u003cvasilii@chromium.org\u003e\nCr-Commit-Position: refs/heads/master@{#626208}(cherry picked from commit ceb5964755062a1972ad1f7c12b5aff134ce71bf)\n\n----- https://crrev.com/c/1437703\nAdd includes for IWYU: follow-on for cl/1428939\n\nThis CL just adds some includes that were harmlessly forgotten\non https://crrev.com/c/1428939 .\n\nChange-Id: Ic885065cbf20398dfff723a85aff35141e0cb9a5\nReviewed-on: https://chromium-review.googlesource.com/c/1444696\nReviewed-by: Justin Donnelly \u003cjdonnelly@chromium.org\u003e\nCr-Commit-Position: refs/branch-heads/3683@{#77}\nCr-Branched-From: e51029943e0a38dd794b73caaf6373d5496ae783-refs/heads/master@{#625896}", "tree_diff": [ { "type": "modify", "old_id": "324409bfd37841c839243e7fdb2b72359e33e90e", "old_mode": 33188, "old_path": "components/search_engines/util.cc", "new_id": "d1371e334f80bfabf94b4552fd759b402233f92d", "new_mode": 33188, "new_path": "components/search_engines/util.cc" }, { "type": "modify", "old_id": "39034e5b6fd997e51e959dffcc2984e5e9b9389c", "old_mode": 33188, "old_path": "components/search_engines/util.h", "new_id": "d3790c99444896e4f35c3c098f31a2bfe481ad99", "new_mode": 33188, "new_path": "components/search_engines/util.h" } ] }