Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(532)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/safe_browsing/srt_fetcher_browsertest_win.cc

Issue 2812223003: Move shared constants to //components/chrome_cleaner (Closed)
Patch Set: Comment on #endif line Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/BUILD.gn ('K') | « chrome/browser/safe_browsing/srt_client_info_win.cc ('k') | chrome/browser/safe_browsing/srt_fetcher_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/srt_fetcher_browsertest_win.cc
diff --git a/chrome/browser/safe_browsing/srt_fetcher_browsertest_win.cc b/chrome/browser/safe_browsing/srt_fetcher_browsertest_win.cc
index 60053da7e6aeaf67233d9afea955a2f5db815d7d..1760b8a763426fc225e83e8b63c0c75394bcaee1 100644
--- a/chrome/browser/safe_browsing/srt_fetcher_browsertest_win.cc
+++ b/chrome/browser/safe_browsing/srt_fetcher_browsertest_win.cc
@@ -36,6 +36,7 @@
#include "chrome/browser/ui/test/test_browser_dialog.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/in_process_browser_test.h"
+#include "components/chrome_cleaner/constants/constants.h"
#include "components/chrome_cleaner/public/interfaces/chrome_prompt.mojom.h"
#include "components/component_updater/pref_names.h"
#include "components/prefs/pref_service.h"
@@ -194,8 +195,8 @@ MULTIPROCESS_TEST_MAIN(MockSwReporterProcess) {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
const std::string& str =
command_line->GetSwitchValueASCII(kExitCodeToReturnSwitch);
- const std::string& chrome_mojo_pipe_token =
- command_line->GetSwitchValueASCII(kChromeMojoPipeTokenSwitch);
+ const std::string& chrome_mojo_pipe_token = command_line->GetSwitchValueASCII(
+ chrome_cleaner::kChromeMojoPipeTokenSwitch);
int exit_code_to_report = kFailureExitCode;
bool success = base::StringToInt(str, &exit_code_to_report) &&
(chrome_mojo_pipe_token.empty() ||
@@ -282,7 +283,7 @@ class SRTFetcherTest
base::IntToString(exit_code_to_report_));
if (in_browser_cleaner_ui_) {
AddPromptAcceptanceToCommandLine(PromptAcceptance::DENIED, &command_line);
- if (exit_code_to_report_ == kSwReporterCleanupNeeded) {
+ if (exit_code_to_report_ == chrome_cleaner::kSwReporterCleanupNeeded) {
command_line.AppendSwitch(kReportUwSFoundSwitch);
if (elevation_required_)
command_line.AppendSwitch(kReportElevationRequiredSwitch);
@@ -438,8 +439,9 @@ class SRTFetcherTest
void ExpectLoggingSwitches(const SwReporterInvocation& invocation,
bool expect_switches) {
static const std::set<std::string> logging_switches{
- kExtendedSafeBrowsingEnabledSwitch, kChromeVersionSwitch,
- kChromeChannelSwitch};
+ chrome_cleaner::kExtendedSafeBrowsingEnabledSwitch,
+ chrome_cleaner::kChromeVersionSwitch,
+ chrome_cleaner::kChromeChannelSwitch};
const base::CommandLine::SwitchMap& invocation_switches =
invocation.command_line.GetSwitches();
@@ -489,14 +491,14 @@ class SRTFetcherPromptTest : public DialogBrowserTest {
} // namespace
-IN_PROC_BROWSER_TEST_P(SRTFetcherTest, NothingFound) {
- RunReporter(kSwReporterNothingFound);
+IN_PROC_BROWSER_TEST_F(SRTFetcherTest, NothingFound) {
joenotcharles 2017/04/12 15:44:42 Bad merge here.
ftirelo 2017/04/12 19:40:41 Done.
+ RunReporter(chrome_cleaner::kSwReporterNothingFound);
ExpectReporterLaunches(0, 1, false);
ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
}
-IN_PROC_BROWSER_TEST_P(SRTFetcherTest, CleanupNeeded) {
- RunReporter(kSwReporterCleanupNeeded);
+IN_PROC_BROWSER_TEST_F(SRTFetcherTest, CleanupNeeded) {
joenotcharles 2017/04/12 15:44:42 Bad merge here.
ftirelo 2017/04/12 19:40:41 Done.
+ RunReporter(chrome_cleaner::kSwReporterCleanupNeeded);
ExpectReporterLaunches(0, 1, true);
ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
}
@@ -504,7 +506,7 @@ IN_PROC_BROWSER_TEST_P(SRTFetcherTest, CleanupNeeded) {
IN_PROC_BROWSER_TEST_P(SRTFetcherTest, RanRecently) {
constexpr int kDaysLeft = 1;
SetDaysSinceLastTriggered(kDaysBetweenSuccessfulSwReporterRuns - kDaysLeft);
- RunReporter(kSwReporterNothingFound);
+ RunReporter(chrome_cleaner::kSwReporterNothingFound);
ExpectReporterLaunches(0, 0, false);
ExpectToRunAgain(kDaysLeft);
ExpectReporterLaunches(kDaysLeft, 1, false);
@@ -530,7 +532,7 @@ IN_PROC_BROWSER_TEST_P(SRTFetcherTest, DISABLED_WaitForBrowser) {
ASSERT_FALSE(chrome::FindLastActive());
// Start the reporter while the browser is closed. The prompt should not open.
- RunReporter(kSwReporterCleanupNeeded);
+ RunReporter(chrome_cleaner::kSwReporterCleanupNeeded);
ExpectReporterLaunches(0, 1, false);
// Create a Browser object directly instead of using helper functions like
@@ -564,7 +566,7 @@ IN_PROC_BROWSER_TEST_P(SRTFetcherTest, RunDaily) {
SetDaysSinceLastTriggered(kDaysBetweenSuccessfulSwReporterRuns - 1);
ASSERT_GT(kDaysBetweenSuccessfulSwReporterRuns - 1,
kDaysBetweenSwReporterRunsForPendingPrompt);
- RunReporter(kSwReporterNothingFound);
+ RunReporter(chrome_cleaner::kSwReporterNothingFound);
// Expect the reporter to run immediately, since a prompt is pending and it
// has been more than kDaysBetweenSwReporterRunsForPendingPrompt days.
@@ -600,7 +602,7 @@ IN_PROC_BROWSER_TEST_P(SRTFetcherTest, ParameterChange) {
{
SCOPED_TRACE("N days left until next reporter run");
SetDaysSinceLastTriggered(kDaysBetweenSuccessfulSwReporterRuns - kDaysLeft);
- RunReporter(kSwReporterNothingFound, path1);
+ RunReporter(chrome_cleaner::kSwReporterNothingFound, path1);
ExpectReporterLaunches(0, {}, false);
}
@@ -608,9 +610,9 @@ IN_PROC_BROWSER_TEST_P(SRTFetcherTest, ParameterChange) {
// Now the reporter should launch, just once, using path2.
{
SCOPED_TRACE("Reporter runs now");
- RunReporter(kSwReporterNothingFound, path2);
+ RunReporter(chrome_cleaner::kSwReporterNothingFound, path2);
// Schedule it twice; it should only actually run once.
- RunReporter(kSwReporterNothingFound, path2);
+ RunReporter(chrome_cleaner::kSwReporterNothingFound, path2);
ExpectReporterLaunches(kDaysLeft, {path2}, false);
}
@@ -618,7 +620,7 @@ IN_PROC_BROWSER_TEST_P(SRTFetcherTest, ParameterChange) {
// The reporter should not launch.
{
SCOPED_TRACE("No more time passed");
- RunReporter(kSwReporterNothingFound, path3);
+ RunReporter(chrome_cleaner::kSwReporterNothingFound, path3);
ExpectReporterLaunches(0, {}, false);
}
@@ -636,7 +638,7 @@ IN_PROC_BROWSER_TEST_P(SRTFetcherTest, ParameterChange) {
// passed, even though the parameters haven't changed.
{
SCOPED_TRACE("Run with same parameters");
- RunReporter(kSwReporterNothingFound, path3);
+ RunReporter(chrome_cleaner::kSwReporterNothingFound, path3);
ExpectReporterLaunches(kDaysBetweenSuccessfulSwReporterRuns, {path3},
false);
}
@@ -656,7 +658,7 @@ IN_PROC_BROWSER_TEST_P(SRTFetcherTest, MultipleLaunches) {
{
SCOPED_TRACE("Launch 2 times");
SetDaysSinceLastTriggered(kDaysBetweenSuccessfulSwReporterRuns);
- RunReporterQueue(kSwReporterNothingFound, invocations);
+ RunReporterQueue(chrome_cleaner::kSwReporterNothingFound, invocations);
ExpectReporterLaunches(0, {path1, path2}, false);
ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
}
@@ -665,8 +667,8 @@ IN_PROC_BROWSER_TEST_P(SRTFetcherTest, MultipleLaunches) {
// just run 2 times, not 4.
{
SCOPED_TRACE("Launch 2 times with retry");
- RunReporterQueue(kSwReporterNothingFound, invocations);
- RunReporterQueue(kSwReporterNothingFound, invocations);
+ RunReporterQueue(chrome_cleaner::kSwReporterNothingFound, invocations);
+ RunReporterQueue(chrome_cleaner::kSwReporterNothingFound, invocations);
ExpectReporterLaunches(kDaysBetweenSuccessfulSwReporterRuns, {path1, path2},
false);
ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
@@ -679,7 +681,7 @@ IN_PROC_BROWSER_TEST_P(SRTFetcherTest, MultipleLaunches) {
invocations.push(SwReporterInvocation::FromFilePath(path3));
first_launch_callback_ = base::BindOnce(
&SRTFetcherTest::RunReporterQueue, base::Unretained(this),
- kSwReporterNothingFound, invocations);
+ chrome_cleaner::kSwReporterNothingFound, invocations);
// Only the first two elements should execute since the third was added
// during the cycle.
@@ -712,8 +714,8 @@ IN_PROC_BROWSER_TEST_P(SRTFetcherTest, MultipleLaunches) {
}
}
-IN_PROC_BROWSER_TEST_P(SRTFetcherTest, ReporterLogging_NoSBExtendedReporting) {
- RunReporter(kSwReporterNothingFound);
+IN_PROC_BROWSER_TEST_F(SRTFetcherTest, ReporterLogging_NoSBExtendedReporting) {
joenotcharles 2017/04/12 15:44:42 Bad merge here.
ftirelo 2017/04/12 19:40:41 Done.
+ RunReporter(chrome_cleaner::kSwReporterNothingFound);
ExpectReporterLaunches(0, 1, false);
ExpectLoggingSwitches(reporter_launch_parameters_.front(), false);
ExpectLastTimeSentReportNotSet();
@@ -725,7 +727,7 @@ IN_PROC_BROWSER_TEST_P(SRTFetcherTest, ReporterLogging_EnabledFirstRun) {
// Note: don't set last time sent logs in the local state.
// SBER is enabled and there is no record in the local state of the last time
// logs have been sent, so we should send logs in this run.
- RunReporter(kSwReporterNothingFound);
+ RunReporter(chrome_cleaner::kSwReporterNothingFound);
ExpectReporterLaunches(0, 1, false);
ExpectLoggingSwitches(reporter_launch_parameters_.front(), true);
ExpectLastReportSentInTheLastHour();
@@ -737,7 +739,7 @@ IN_PROC_BROWSER_TEST_P(SRTFetcherTest, ReporterLogging_EnabledNoRecentLogging) {
// |kDaysBetweenReporterLogsSent| day ago, so we should send logs in this run.
EnableSBExtendedReporting();
SetLastTimeSentReport(kDaysBetweenReporterLogsSent + 3);
- RunReporter(kSwReporterNothingFound);
+ RunReporter(chrome_cleaner::kSwReporterNothingFound);
ExpectReporterLaunches(0, 1, false);
ExpectLoggingSwitches(reporter_launch_parameters_.front(), true);
ExpectLastReportSentInTheLastHour();
@@ -751,7 +753,7 @@ IN_PROC_BROWSER_TEST_P(SRTFetcherTest, ReporterLogging_EnabledRecentlyLogged) {
EnableSBExtendedReporting();
SetLastTimeSentReport(kDaysBetweenReporterLogsSent - 1);
int64_t last_time_sent_logs = GetLastTimeSentReport();
- RunReporter(kSwReporterNothingFound);
+ RunReporter(chrome_cleaner::kSwReporterNothingFound);
ExpectReporterLaunches(0, 1, false);
ExpectLoggingSwitches(reporter_launch_parameters_.front(), false);
EXPECT_EQ(last_time_sent_logs, GetLastTimeSentReport());
@@ -771,7 +773,7 @@ IN_PROC_BROWSER_TEST_P(SRTFetcherTest, ReporterLogging_MultipleLaunches) {
SwReporterInvocation::BEHAVIOUR_ALLOW_SEND_REPORTER_LOGS;
invocations.push(invocation);
}
- RunReporterQueue(kSwReporterNothingFound, invocations);
+ RunReporterQueue(chrome_cleaner::kSwReporterNothingFound, invocations);
// SBER is enabled and last time logs were sent was more than
// |kDaysBetweenReporterLogsSent| day ago, so we should send logs in this run.
« chrome/browser/BUILD.gn ('K') | « chrome/browser/safe_browsing/srt_client_info_win.cc ('k') | chrome/browser/safe_browsing/srt_fetcher_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698