Revert "Implement ProtoChromePromptIPC." This reverts commit e5f1b06d49463065691dfe49b82f1498dae7bd6f. Reason for revert: suspect causing chrome_cleaner_unittests failure on windows-bots because of: https://ci.chromium.org/p/chromium/builders/ci/Win10%20Tests%20x64/39695 https://ci.chromium.org/p/chromium/builders/ci/Win7%20Tests%20%281%29/94372 ... UwSPresent/ProtoChromePromptIPCTest.Communication/true_true_PromptAcceptanceACCEPTED_WITHOUT_LOGS_DisconnectedAfterCloseMessageLength UwSPresent/ProtoChromePromptIPCTest.Communication/true_true_PromptAcceptanceDENIED_DisconnectedAfterCloseMessageLength UwSPresent/ProtoChromePromptIPCTest.Communication/true_true_PromptAcceptanceACCEPTED_WITH_LOGS_NotDisconnected UwSPresent/ProtoChromePromptIPCTest.Communication/true_false_PromptAcceptanceACCEPTED_WITH_LOGS_NotDisconnected E.g. win7 tests' log https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8904641206741120976/+/steps/chrome_cleaner_unittests/0/logs/Deterministic_failure:_NoUwSPresent__x2f_ProtoChromePromptIPCTest.Communication__x2f_false_false_PromptAcceptanceDENIED_NotDisconnected__status_FAILURE_/0 [ RUN ] NoUwSPresent/ProtoChromePromptIPCTest.Communication/false_false_PromptAcceptanceDENIED_NotDisconnected [636:3088:0819/200428.002:5454013:ERROR:proto_chrome_prompt_ipc.h(74)] Writing a message to the pipe failed.: The pipe has been ended. (0x6D) ../../chrome/chrome_cleaner/ipc/proto_chrome_prompt_ipc_unittest.cc(648): error: Expected equality of these values: error_occurred_ Which is: true should_have_errors Which is: false ../../chrome/chrome_cleaner/ipc/proto_chrome_prompt_ipc_unittest.cc(670): error: Expected equality of these values: expected_exit_code Which is: 0 rv Which is: -1 Original change's description: > Implement ProtoChromePromptIPC. > > Bug: 969139 > Change-Id: I35d551b6bdb41b4e6bd7689120c21d9d683ad72f > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1733747 > Commit-Queue: Oliver Li <olivierli@chromium.org> > Reviewed-by: Will Harris <wfh@chromium.org> > Reviewed-by: Joe Mason <joenotcharles@google.com> > Cr-Commit-Position: refs/heads/master@{#688357} TBR=joenotcharles@google.com,wfh@chromium.org,olivierli@chromium.org Change-Id: If19d65f100db413bd68ca5f9bfa60aa426474e00 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 969139 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1760644 Reviewed-by: Takashi Sakamoto <tasak@google.com> Commit-Queue: Takashi Sakamoto <tasak@google.com> Cr-Original-Commit-Position: refs/heads/master@{#688406} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 68edeb13f4e94d16b89c08777d25d90e5e87b0f6
diff --git a/public/proto/BUILD.gn b/public/proto/BUILD.gn index 0f556a4..d24d95e 100644 --- a/public/proto/BUILD.gn +++ b/public/proto/BUILD.gn
@@ -9,11 +9,3 @@ "chrome_prompt.proto", ] } - -proto_library("test_only_proto") { - testonly = true - generate_python = false - sources = [ - "chrome_prompt_for_tests.proto", - ] -}
diff --git a/public/proto/chrome_prompt_for_tests.proto b/public/proto/chrome_prompt_for_tests.proto deleted file mode 100644 index e368a22..0000000 --- a/public/proto/chrome_prompt_for_tests.proto +++ /dev/null
@@ -1,64 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file mirrors //components/chrome_cleaner/proto/chrome_prompt.proto but -// contains added fields to validate that they do not break the parsing. This is -// to simulate an outdated Chrome handling messages from an updated cleaner. - -// This file contains minimal comments. For descriptions of non-test -// fields/messages please refer to the original file. - -syntax = "proto2"; -option optimize_for = LITE_RUNTIME; - -package chrome_cleaner_test_only; - -message CloseConnectionRequest {} - -message QueryCapabilityRequest { - optional bool FOR_TESTS_ONLY = 255; -} - -message QueryCapabilityResponse {} - -message PromptUserRequest { - repeated string files_to_delete = 1; - repeated string registry_keys = 2; - repeated string extension_ids = 3; - repeated string FOR_TESTS_ONLY = 255; -} - -message PromptUserResponse { - enum PromptAcceptance { - UNSPECIFIED = 0; - ACCEPTED_WITH_LOGS = 1; - ACCEPTED_WITHOUT_LOGS = 2; - DENIED = 3; - FOR_TESTS_ONLY = 255; - }; - - optional PromptAcceptance prompt_acceptance = 1 [default = UNSPECIFIED]; -} - -message RemoveExtensionsRequest { - repeated string extension_ids = 1; -} - -message RemoveExtensionsResponse { - optional bool success = 1; -} - -message FOR_TESTS_ONLY { - optional bool dummy_value = 1; -} - -message ChromePromptRequest { - oneof request { - CloseConnectionRequest close_connection = 1; - QueryCapabilityRequest query_capability = 2; - PromptUserRequest prompt_user = 3; - RemoveExtensionsRequest remove_extensions = 4; - FOR_TESTS_ONLY test_message = 255; - } -}