Create test build of Chrome Cleanup tool using chrome_cleaner/cleaner directory from chromium |
||||
Issue descriptionThe following commits from crbug.com/802092 created a chrome_cleaner/cleaner directory: https://crrev.com/60ec2f36fc2187cf86d91b9d8a41b1832ada7344 (creates empty chrome_cleaner/ directory) https://crrev.com/6c97f7fd1c9a29542931952effa8ec2293db8341 (adds new constants to components/chrome_cleaner/public) https://crrev.com/f19a924e59e8cea9f442e17623407662d2c6b0d3 (creates chrome_cleaner/cleaner/) I'd like to merge these to M64 so that they can be included as DEPS in a test build of the Chrome Cleanup Tool, to make sure the overall process of adding DEPS works before continuing to add more directories in crbug.com/802092. I've made a new bug for this approval since crbug.com/802092 covers more directories than just this and I want to be clear I'm not planning to merge the whole thing. These patches should not affect the chromium build at all since the chrome_cleaner/ directory is not included anywhere. The only change that touches code used by chromium is: --- a/components/chrome_cleaner/public/constants/constants.h +++ b/components/chrome_cleaner/public/constants/constants.h // Exit codes from the Software Reporter process identified by Chrome. -constexpr int kSwReporterCleanupNeeded = 0; -constexpr int kSwReporterNothingFound = 2; -constexpr int kSwReporterPostRebootCleanupNeeded = 4; -constexpr int kSwReporterNonRemovableOnly = 10; -constexpr int kSwReporterDelayedPostRebootCleanupNeeded = 15; -constexpr int kSwReporterSuspiciousOnly = 32; -constexpr int kSwReporterTimeoutWithoutUwS = 34; -constexpr int kSwReporterTimeoutWithUwS = 35; +constexpr int kSwReporterCleanupNeeded = RESULT_CODE_SUCCESS; +constexpr int kSwReporterNothingFound = RESULT_CODE_NO_PUPS_FOUND; +constexpr int kSwReporterPostRebootCleanupNeeded = + DEPRECATED_RESULT_CODE_ABOUT_TO_REBOOT; +constexpr int kSwReporterNonRemovableOnly = + RESULT_CODE_EXAMINED_FOR_REMOVAL_ONLY; +constexpr int kSwReporterDelayedPostRebootCleanupNeeded = + RESULT_CODE_PENDING_REBOOT; +constexpr int kSwReporterSuspiciousOnly = RESULT_CODE_REPORT_ONLY_PUPS_FOUND; +constexpr int kSwReporterTimeoutWithoutUwS = + RESULT_CODE_WATCHDOG_TIMEOUT_WITHOUT_REMOVABLE_UWS; +constexpr int kSwReporterTimeoutWithUwS = + RESULT_CODE_WATCHDOG_TIMEOUT_WITH_REMOVABLE_UWS; Where RESULT_CODE_* is defined in the new header file components/chrome_cleaner/public/constants/result_codes.h and have the same values as the hardcoded integers.
,
Mar 26 2018
Approving merge to M64. branch:3282
,
Mar 26 2018
As requested by Abdul, will revert this as soon as it is merged since it only needs to be in the history to be referenced in DEPS.
,
Mar 26 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/e46db0774483f0c7c7a0dd0bab42193e9a4941cb commit e46db0774483f0c7c7a0dd0bab42193e9a4941cb Author: Joe Mason <joenotcharles@chromium.org> Date: Mon Mar 26 19:09:37 2018 Make chrome_cleaner::ResultCode enum public. R=csharp, ftirelo TBR=joenotcharles@chromium.org Change-Id: I0e747d59f2a04b743283b69d0d5f55b56dc162b1 Reviewed-on: https://chromium-review.googlesource.com/966543 Commit-Queue: Joe Mason <joenotcharles@chromium.org> Reviewed-by: Chris Sharp <csharp@chromium.org> Cr-Commit-Position: refs/heads/master@{#544086} (cherry picked from commit 6c97f7fd1c9a29542931952effa8ec2293db8341) Bug: 825933 Change-Id: I099e9b84484a313d6a97db270fcba516067117b6 Reviewed-on: https://chromium-review.googlesource.com/981194 Reviewed-by: Joe Mason <joenotcharles@chromium.org> Cr-Commit-Position: refs/branch-heads/3282@{#714} Cr-Branched-From: 5fdc0fab22ce7efd32532ee989b223fa12f8171e-refs/heads/master@{#520840} [modify] https://crrev.com/e46db0774483f0c7c7a0dd0bab42193e9a4941cb/chrome/browser/BUILD.gn [modify] https://crrev.com/e46db0774483f0c7c7a0dd0bab42193e9a4941cb/components/chrome_cleaner/public/constants/BUILD.gn [modify] https://crrev.com/e46db0774483f0c7c7a0dd0bab42193e9a4941cb/components/chrome_cleaner/public/constants/constants.h [add] https://crrev.com/e46db0774483f0c7c7a0dd0bab42193e9a4941cb/components/chrome_cleaner/public/constants/result_codes.h
,
Mar 26 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/598cedff59a732c23acb20c7df1e05b97e0d76a1 commit 598cedff59a732c23acb20c7df1e05b97e0d76a1 Author: Joe Mason <joenotcharles@chromium.org> Date: Mon Mar 26 19:13:00 2018 Copy chrome_cleaner/cleaner/ from the internal repo R=csharp TBR=joenotcharles@chromium.org (cherry picked from commit f19a924e59e8cea9f442e17623407662d2c6b0d3) Bug: 825933 Change-Id: I9837aa806ed9a3f6a58465dbffe2dfd2b34d03ac Reviewed-on: https://chromium-review.googlesource.com/967945 Commit-Queue: Joe Mason <joenotcharles@chromium.org> Reviewed-by: Chris Sharp <csharp@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#544841} Reviewed-on: https://chromium-review.googlesource.com/981175 Reviewed-by: Joe Mason <joenotcharles@chromium.org> Cr-Commit-Position: refs/branch-heads/3282@{#715} Cr-Branched-From: 5fdc0fab22ce7efd32532ee989b223fa12f8171e-refs/heads/master@{#520840} [add] https://crrev.com/598cedff59a732c23acb20c7df1e05b97e0d76a1/chrome_cleaner/cleaner/BUILD.gn [add] https://crrev.com/598cedff59a732c23acb20c7df1e05b97e0d76a1/chrome_cleaner/cleaner/DEPS [add] https://crrev.com/598cedff59a732c23acb20c7df1e05b97e0d76a1/chrome_cleaner/cleaner/cleaner.h [add] https://crrev.com/598cedff59a732c23acb20c7df1e05b97e0d76a1/chrome_cleaner/cleaner/noop_cleaner_impl.cc [add] https://crrev.com/598cedff59a732c23acb20c7df1e05b97e0d76a1/chrome_cleaner/cleaner/noop_cleaner_impl.h [add] https://crrev.com/598cedff59a732c23acb20c7df1e05b97e0d76a1/chrome_cleaner/constants/BUILD.gn [add] https://crrev.com/598cedff59a732c23acb20c7df1e05b97e0d76a1/chrome_cleaner/constants/uws_id.h
,
Mar 26 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/7c4e4cf878292fcd67a460ca6ca4f6331411871b commit 7c4e4cf878292fcd67a460ca6ca4f6331411871b Author: Joe Mason <joenotcharles@chromium.org> Date: Mon Mar 26 19:34:54 2018 Revert "Copy chrome_cleaner/cleaner/ from the internal repo" This reverts commit 598cedff59a732c23acb20c7df1e05b97e0d76a1. Reason for revert: Removing from stable build; only need this in history for DEPS Original change's description: > Copy chrome_cleaner/cleaner/ from the internal repo > > R=csharp > TBR=joenotcharles@chromium.org > > (cherry picked from commit f19a924e59e8cea9f442e17623407662d2c6b0d3) > > Bug: 825933 > Change-Id: I9837aa806ed9a3f6a58465dbffe2dfd2b34d03ac > Reviewed-on: https://chromium-review.googlesource.com/967945 > Commit-Queue: Joe Mason <joenotcharles@chromium.org> > Reviewed-by: Chris Sharp <csharp@chromium.org> > Cr-Original-Commit-Position: refs/heads/master@{#544841} > Reviewed-on: https://chromium-review.googlesource.com/981175 > Reviewed-by: Joe Mason <joenotcharles@chromium.org> > Cr-Commit-Position: refs/branch-heads/3282@{#715} > Cr-Branched-From: 5fdc0fab22ce7efd32532ee989b223fa12f8171e-refs/heads/master@{#520840} TBR=csharp@chromium.org,joenotcharles@chromium.org Change-Id: I841198506ee6f07b1d624929442ead70887f14b7 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 825933 Reviewed-on: https://chromium-review.googlesource.com/981153 Reviewed-by: Joe Mason <joenotcharles@chromium.org> Cr-Commit-Position: refs/branch-heads/3282@{#716} Cr-Branched-From: 5fdc0fab22ce7efd32532ee989b223fa12f8171e-refs/heads/master@{#520840} [delete] https://crrev.com/598cedff59a732c23acb20c7df1e05b97e0d76a1/chrome_cleaner/cleaner/BUILD.gn [delete] https://crrev.com/598cedff59a732c23acb20c7df1e05b97e0d76a1/chrome_cleaner/cleaner/DEPS [delete] https://crrev.com/598cedff59a732c23acb20c7df1e05b97e0d76a1/chrome_cleaner/cleaner/cleaner.h [delete] https://crrev.com/598cedff59a732c23acb20c7df1e05b97e0d76a1/chrome_cleaner/cleaner/noop_cleaner_impl.cc [delete] https://crrev.com/598cedff59a732c23acb20c7df1e05b97e0d76a1/chrome_cleaner/cleaner/noop_cleaner_impl.h [delete] https://crrev.com/598cedff59a732c23acb20c7df1e05b97e0d76a1/chrome_cleaner/constants/BUILD.gn [delete] https://crrev.com/598cedff59a732c23acb20c7df1e05b97e0d76a1/chrome_cleaner/constants/uws_id.h
,
Mar 26 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/e202db9b2d15872b3371009ef25b8ccc240c9aac commit e202db9b2d15872b3371009ef25b8ccc240c9aac Author: Joe Mason <joenotcharles@chromium.org> Date: Mon Mar 26 19:35:10 2018 Revert "Make chrome_cleaner::ResultCode enum public." This reverts commit e46db0774483f0c7c7a0dd0bab42193e9a4941cb. Reason for revert: Remove from stable build; only need this in the history for DEPS Original change's description: > Make chrome_cleaner::ResultCode enum public. > > R=csharp, ftirelo > TBR=joenotcharles@chromium.org > > Change-Id: I0e747d59f2a04b743283b69d0d5f55b56dc162b1 > Reviewed-on: https://chromium-review.googlesource.com/966543 > Commit-Queue: Joe Mason <joenotcharles@chromium.org> > Reviewed-by: Chris Sharp <csharp@chromium.org> > Cr-Commit-Position: refs/heads/master@{#544086} > (cherry picked from commit 6c97f7fd1c9a29542931952effa8ec2293db8341) > > > Bug: 825933 > Change-Id: I099e9b84484a313d6a97db270fcba516067117b6 > Reviewed-on: https://chromium-review.googlesource.com/981194 > Reviewed-by: Joe Mason <joenotcharles@chromium.org> > Cr-Commit-Position: refs/branch-heads/3282@{#714} > Cr-Branched-From: 5fdc0fab22ce7efd32532ee989b223fa12f8171e-refs/heads/master@{#520840} TBR=csharp@chromium.org,joenotcharles@chromium.org,ftirelo@chromium.org Change-Id: Ic86c940fddffe41611857f0c88aec542412c723f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 825933 Reviewed-on: https://chromium-review.googlesource.com/981088 Reviewed-by: Joe Mason <joenotcharles@chromium.org> Cr-Commit-Position: refs/branch-heads/3282@{#717} Cr-Branched-From: 5fdc0fab22ce7efd32532ee989b223fa12f8171e-refs/heads/master@{#520840} [modify] https://crrev.com/e202db9b2d15872b3371009ef25b8ccc240c9aac/chrome/browser/BUILD.gn [modify] https://crrev.com/e202db9b2d15872b3371009ef25b8ccc240c9aac/components/chrome_cleaner/public/constants/BUILD.gn [modify] https://crrev.com/e202db9b2d15872b3371009ef25b8ccc240c9aac/components/chrome_cleaner/public/constants/constants.h [delete] https://crrev.com/7c4e4cf878292fcd67a460ca6ca4f6331411871b/components/chrome_cleaner/public/constants/result_codes.h
,
Mar 26 2018
All merged and then reverted. |
||||
►
Sign in to add a comment |
||||
Comment 1 by joenotcharles@chromium.org
, Mar 26 2018