Commit 93880c88 authored by Sorin Jianu's avatar Sorin Jianu Committed by Commit Bot

Revert "Reland "Safety check: add tests for the Chrome cleaner child backend""

This reverts commit f55b2a09.

Reason for revert: This is still breaking the official Chrome builders, for instance: https://ci.chromium.org/p/chrome/builders/ci/win64-trunk

Sorry for the revert of the reland.

Original change's description:
> Reland "Safety check: add tests for the Chrome cleaner child backend"
> 
> This is a reland of 9d1db5b8
> Fixes the missing import and constant.
> 
> Original change's description:
> > Safety check: add tests for the Chrome cleaner child backend
> >
> > * Test that each possible CCT status results in the corresponding
> >   safety check child status and display string.
> > * Test that CCT being enterprise managed is handled correctly.
> >
> > Bug: 1087263
> > Change-Id: I84d93408800cb4fbe8d138578c586a0ae89dbfc9
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2249980
> > Reviewed-by: Esmael Elmoslimany <aee@chromium.org>
> > Reviewed-by: Joe Mason <joenotcharles@chromium.org>
> > Commit-Queue: Rainhard Findling <rainhard@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#783942}
> 
> Bug: 1087263
> Change-Id: Iddb785080835e437517c7adba7eacaec20356ca6
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2279752
> Reviewed-by: Esmael Elmoslimany <aee@chromium.org>
> Reviewed-by: Joe Mason <joenotcharles@chromium.org>
> Commit-Queue: Rainhard Findling <rainhard@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#785664}

TBR=joenotcharles@chromium.org,aee@chromium.org,rainhard@chromium.org

Change-Id: I03883f5f6bdf59d46b725b76e649d5a4c2a7158a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1087263
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2285386Reviewed-by: default avatarSorin Jianu <sorin@chromium.org>
Commit-Queue: Sorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#785990}
parent 8b53d4dd
...@@ -281,11 +281,6 @@ void ChromeCleanerControllerImpl::SetStateForTesting(State state) { ...@@ -281,11 +281,6 @@ void ChromeCleanerControllerImpl::SetStateForTesting(State state) {
idle_reason_ = IdleReason::kInitial; idle_reason_ = IdleReason::kInitial;
} }
void ChromeCleanerControllerImpl::SetIdleForTesting(IdleReason idle_reason) {
state_ = State::kIdle;
idle_reason_ = idle_reason;
}
// static // static
void ChromeCleanerControllerImpl::ResetInstanceForTesting() { void ChromeCleanerControllerImpl::ResetInstanceForTesting() {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
......
...@@ -84,7 +84,6 @@ class ChromeCleanerControllerImpl : public ChromeCleanerController { ...@@ -84,7 +84,6 @@ class ChromeCleanerControllerImpl : public ChromeCleanerController {
// Force the current controller's state for tests that check the effect of // Force the current controller's state for tests that check the effect of
// starting and completing reporter runs. // starting and completing reporter runs.
void SetStateForTesting(State state); void SetStateForTesting(State state);
void SetIdleForTesting(IdleReason idle_reason);
private: private:
ChromeCleanerControllerImpl(); ChromeCleanerControllerImpl();
......
...@@ -39,11 +39,6 @@ ...@@ -39,11 +39,6 @@
#include "services/network/public/cpp/shared_url_loader_factory.h" #include "services/network/public/cpp/shared_url_loader_factory.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.h"
#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.h"
#endif
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
#include "ui/chromeos/devicetype_utils.h" #include "ui/chromeos/devicetype_utils.h"
#endif #endif
...@@ -54,9 +49,6 @@ constexpr char kUpdates[] = "updates"; ...@@ -54,9 +49,6 @@ constexpr char kUpdates[] = "updates";
constexpr char kPasswords[] = "passwords"; constexpr char kPasswords[] = "passwords";
constexpr char kSafeBrowsing[] = "safe-browsing"; constexpr char kSafeBrowsing[] = "safe-browsing";
constexpr char kExtensions[] = "extensions"; constexpr char kExtensions[] = "extensions";
#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
constexpr char kChromeCleaner[] = "extensions";
#endif
namespace { namespace {
using Enabled = util::StrongAlias<class EnabledTag, bool>; using Enabled = util::StrongAlias<class EnabledTag, bool>;
...@@ -1088,265 +1080,6 @@ TEST_F(SafetyCheckHandlerTest, CheckExtensions_Error) { ...@@ -1088,265 +1080,6 @@ TEST_F(SafetyCheckHandlerTest, CheckExtensions_Error) {
SafetyCheckHandler::ExtensionsStatus::kError, 1); SafetyCheckHandler::ExtensionsStatus::kError, 1);
} }
#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_Checking) {
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(SafetyCheckHandler::ChromeCleanerStatus::kChecking));
ASSERT_TRUE(event);
VerifyDisplayString(event, base::UTF8ToUTF16(""));
}
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_Initial) {
ChromeCleanerControllerImpl::ResetInstanceForTesting();
ChromeCleanerControllerImpl::GetInstance()->SetIdleForTesting(
safe_browsing::ChromeCleanerController::IdleReason::kInitial);
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(SafetyCheckHandler::ChromeCleanerStatus::kInitial));
ASSERT_TRUE(event);
VerifyDisplayString(event, "No harmful software found");
}
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_ReporterFoundNothing) {
ChromeCleanerControllerImpl::ResetInstanceForTesting();
ChromeCleanerControllerImpl::GetInstance()->SetIdleForTesting(
safe_browsing::ChromeCleanerController::IdleReason::
kReporterFoundNothing);
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(
SafetyCheckHandler::ChromeCleanerStatus::kReporterFoundNothing));
ASSERT_TRUE(event);
VerifyDisplayString(event, "No harmful software found");
}
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_ReporterFailed) {
ChromeCleanerControllerImpl::ResetInstanceForTesting();
ChromeCleanerControllerImpl::GetInstance()->SetIdleForTesting(
safe_browsing::ChromeCleanerController::IdleReason::kReporterFailed);
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(
SafetyCheckHandler::ChromeCleanerStatus::kReporterFailed));
ASSERT_TRUE(event);
VerifyDisplayString(
event,
"An error occurred while Chrome was searching for harmful software");
}
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_ScanningFoundNothing) {
ChromeCleanerControllerImpl::ResetInstanceForTesting();
ChromeCleanerControllerImpl::GetInstance()->SetIdleForTesting(
safe_browsing::ChromeCleanerController::IdleReason::
kScanningFoundNothing);
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(
SafetyCheckHandler::ChromeCleanerStatus::kScanningFoundNothing));
ASSERT_TRUE(event);
VerifyDisplayString(event, "No harmful software found");
}
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_ScanningFailed) {
ChromeCleanerControllerImpl::ResetInstanceForTesting();
ChromeCleanerControllerImpl::GetInstance()->SetIdleForTesting(
safe_browsing::ChromeCleanerController::IdleReason::kScanningFailed);
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(
SafetyCheckHandler::ChromeCleanerStatus::kScanningFailed));
ASSERT_TRUE(event);
VerifyDisplayString(
event,
"An error occurred while Chrome was searching for harmful software");
}
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_ConnectionLost) {
ChromeCleanerControllerImpl::ResetInstanceForTesting();
ChromeCleanerControllerImpl::GetInstance()->SetIdleForTesting(
safe_browsing::ChromeCleanerController::IdleReason::kConnectionLost);
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(
SafetyCheckHandler::ChromeCleanerStatus::kConnectionLost));
ASSERT_TRUE(event);
VerifyDisplayString(event, "Chrome found harmful software on your computer");
}
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_UserDeclinedCleanup) {
ChromeCleanerControllerImpl::ResetInstanceForTesting();
ChromeCleanerControllerImpl::GetInstance()->SetIdleForTesting(
safe_browsing::ChromeCleanerController::IdleReason::kUserDeclinedCleanup);
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(
SafetyCheckHandler::ChromeCleanerStatus::kUserDeclinedCleanup));
ASSERT_TRUE(event);
VerifyDisplayString(event, "Chrome found harmful software on your computer");
}
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_CleaningFailed) {
ChromeCleanerControllerImpl::ResetInstanceForTesting();
ChromeCleanerControllerImpl::GetInstance()->SetIdleForTesting(
safe_browsing::ChromeCleanerController::IdleReason::kCleaningFailed);
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(
SafetyCheckHandler::ChromeCleanerStatus::kCleaningFailed));
ASSERT_TRUE(event);
VerifyDisplayString(
event, "An error occurred while Chrome was removing harmful software");
}
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_CleaningSucceed) {
ChromeCleanerControllerImpl::ResetInstanceForTesting();
ChromeCleanerControllerImpl::GetInstance()->SetIdleForTesting(
safe_browsing::ChromeCleanerController::IdleReason::kCleaningSucceeded);
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(
SafetyCheckHandler::ChromeCleanerStatus::kCleaningSucceeded));
ASSERT_TRUE(event);
VerifyDisplayString(event, "No harmful software found");
}
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_CleaningSucceed) {
ChromeCleanerControllerImpl::ResetInstanceForTesting();
ChromeCleanerControllerImpl::GetInstance()->SetIdleForTesting(
safe_browsing::ChromeCleanerController::IdleReason::
kCleanerDownloadFailed);
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(
SafetyCheckHandler::ChromeCleanerStatus::kCleanerDownloadFailed));
ASSERT_TRUE(event);
VerifyDisplayString(event, "Please try again later");
}
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_ReporterRunning) {
ChromeCleanerControllerImpl::ResetInstanceForTesting();
ChromeCleanerControllerImpl::GetInstance()->SetStateForTesting(
safe_browsing::ChromeCleanerController::IdleReason::kReporterRunning);
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(
SafetyCheckHandler::ChromeCleanerStatus::kReporterRunning));
ASSERT_TRUE(event);
VerifyDisplayString(event, "No harmful software found");
}
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_Scanning) {
ChromeCleanerControllerImpl::ResetInstanceForTesting();
ChromeCleanerControllerImpl::GetInstance()->SetStateForTesting(
safe_browsing::ChromeCleanerController::IdleReason::kScanning);
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(SafetyCheckHandler::ChromeCleanerStatus::kScanning));
ASSERT_TRUE(event);
VerifyDisplayString(event, "No harmful software found");
}
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_Infected) {
ChromeCleanerControllerImpl::ResetInstanceForTesting();
ChromeCleanerControllerImpl::GetInstance()->SetStateForTesting(
safe_browsing::ChromeCleanerController::State::kInfected);
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(SafetyCheckHandler::ChromeCleanerStatus::kInfected));
ASSERT_TRUE(event);
VerifyDisplayString(event, "Chrome found harmful software on your computer");
}
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_Cleaning) {
ChromeCleanerControllerImpl::ResetInstanceForTesting();
ChromeCleanerControllerImpl::GetInstance()->SetStateForTesting(
safe_browsing::ChromeCleanerController::State::kCleaning);
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(SafetyCheckHandler::ChromeCleanerStatus::kCleaning));
ASSERT_TRUE(event);
VerifyDisplayString(event, "Removing harmful software...");
}
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_RebootRequired) {
ChromeCleanerControllerImpl::ResetInstanceForTesting();
ChromeCleanerControllerImpl::GetInstance()->SetStateForTesting(
safe_browsing::ChromeCleanerController::State::kRebootRequired);
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(
SafetyCheckHandler::ChromeCleanerStatus::kRebootRequired));
ASSERT_TRUE(event);
VerifyDisplayString(
event, "To finish removing harmful software, restart your computer");
}
TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_DisabledByAdmin) {
ChromeCleanerControllerImpl::ResetInstanceForTesting();
ChromeCleanerControllerImpl::GetInstance()->SetStateForTesting(
safe_browsing::ChromeCleanerController::State::kDisabledByAdmin);
safety_check_->PerformSafetyCheck();
const base::DictionaryValue* event =
GetSafetyCheckStatusChangedWithDataIfExists(
kChromeCleaner,
static_cast<int>(
SafetyCheckHandler::ChromeCleanerStatus::kDisabledByAdmin));
ASSERT_TRUE(event);
VerifyDisplayString(
event,
"Your administrator has disabled browser's check for harmful software");
}
#endif
TEST_F(SafetyCheckHandlerTest, CheckParentRanDisplayString) { TEST_F(SafetyCheckHandlerTest, CheckParentRanDisplayString) {
// 1 second before midnight Dec 31st 2020, so that -(24h-1s) is still on the // 1 second before midnight Dec 31st 2020, so that -(24h-1s) is still on the
// same day. This test time is hard coded to prevent DST flakiness, see // same day. This test time is hard coded to prevent DST flakiness, see
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment