Skip to content

Commit

Permalink
Cherry-picking this into Canary to trigger a new canary build for today.
Browse files Browse the repository at this point in the history 
TBR:sorin@chromium.org,aee@chromium.org,joenotcharles@chromium.org

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

This reverts commit f55b2a0.

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 9d1db5b
> 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

(cherry picked from commit 93880c8)

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/+/2285386
Reviewed-by: Sorin Jianu <sorin@chromium.org>
Commit-Queue: Sorin Jianu <sorin@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#785990}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2287312
Reviewed-by: Rainhard Findling <rainhard@chromium.org>
Commit-Queue: Rainhard Findling <rainhard@chromium.org>
Cr-Commit-Position: refs/branch-heads/4196@{#3}
Cr-Branched-From: 88e8b96-refs/heads/master@{#785888}
  • Loading branch information
@sorinj
sorinj authored and Commit Bot committed Jul 8, 2020
1 parent 8926f42 commit 293f5a8
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 273 deletions.
5 changes: 0 additions & 5 deletions chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,6 @@ void ChromeCleanerControllerImpl::SetStateForTesting(State state) {
idle_reason_ = IdleReason::kInitial;
}

void ChromeCleanerControllerImpl::SetIdleForTesting(IdleReason idle_reason) {
state_ = State::kIdle;
idle_reason_ = idle_reason;
}

// static
void ChromeCleanerControllerImpl::ResetInstanceForTesting() {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
Expand Down
1 change: 0 additions & 1 deletion chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ class ChromeCleanerControllerImpl : public ChromeCleanerController {
// Force the current controller's state for tests that check the effect of
// starting and completing reporter runs.
void SetStateForTesting(State state);
void SetIdleForTesting(IdleReason idle_reason);

private:
ChromeCleanerControllerImpl();
Expand Down
267 changes: 0 additions & 267 deletions chrome/browser/ui/webui/settings/safety_check_handler_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@
#include "services/network/public/cpp/shared_url_loader_factory.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)
#include "ui/chromeos/devicetype_utils.h"
#endif
Expand All @@ -54,9 +49,6 @@ constexpr char kUpdates[] = "updates";
constexpr char kPasswords[] = "passwords";
constexpr char kSafeBrowsing[] = "safe-browsing";
constexpr char kExtensions[] = "extensions";
#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
constexpr char kChromeCleaner[] = "extensions";
#endif

namespace {
using Enabled = util::StrongAlias<class EnabledTag, bool>;
Expand Down Expand Up @@ -1088,265 +1080,6 @@ TEST_F(SafetyCheckHandlerTest, CheckExtensions_Error) {
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) {
// 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
Expand Down

0 comments on commit 293f5a8

Please sign in to comment.