[M87]Update the Enhanced Protection deep link.
After clicking on the Enhanced Protection
promo on desktop, the Security settings page
should open with the Enhanced Protection section
expanded.
[email protected]
(cherry picked from commit 9f8042b4660bf36d2570b3ee7ea53cabbdc9246c)
Bug: 1130722
Change-Id: I646566199755862055e8be0fba00259ecf48d704
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2454404
Reviewed-by: Mustafa Emre Acer <[email protected]>
Reviewed-by: Xinghui Lu <[email protected]>
Reviewed-by: David Trainor <[email protected]>
Commit-Queue: Bettina Dea <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#815066}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2461145
Reviewed-by: Bettina Dea <[email protected]>
Cr-Commit-Position: refs/branch-heads/4280@{#300}
Cr-Branched-From: ea420fb963f9658c9969b6513c56b8f47efa1a2a-refs/heads/master@{#812852}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index a583185..2556ddfc 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1554,16 +1554,17 @@
kPromoBrowserCommandOpenSafetyCheckCommandParam[] = {
{features::kPromoBrowserCommandIdParam, "1"}};
const FeatureEntry::FeatureParam
- kPromoBrowserCommandOpenSafeBrowsingSettingsCommandParam[] = {
- {features::kPromoBrowserCommandIdParam, "2"}};
+ kPromoBrowserCommandOpenSafeBrowsingSettingsEnhancedProtectionCommandParam
+ [] = {{features::kPromoBrowserCommandIdParam, "2"}};
const FeatureEntry::FeatureVariation kPromoBrowserCommandsVariations[] = {
{"- Unknown Command", kPromoBrowserCommandUnknownCommandParam,
base::size(kPromoBrowserCommandUnknownCommandParam), nullptr},
{"- Open Safety Check", kPromoBrowserCommandOpenSafetyCheckCommandParam,
base::size(kPromoBrowserCommandOpenSafetyCheckCommandParam), nullptr},
- {"- Open Safe Browsing Settings",
- kPromoBrowserCommandOpenSafeBrowsingSettingsCommandParam,
- base::size(kPromoBrowserCommandOpenSafeBrowsingSettingsCommandParam),
+ {"- Open Safe Browsing Enhanced Protection Settings",
+ kPromoBrowserCommandOpenSafeBrowsingSettingsEnhancedProtectionCommandParam,
+ base::size(
+ kPromoBrowserCommandOpenSafeBrowsingSettingsEnhancedProtectionCommandParam),
nullptr}};
#if !defined(OS_ANDROID)
const FeatureEntry::FeatureVariation kNtpShoppingTasksModuleVariations[] = {
diff --git a/chrome/browser/promo_browser_command/promo_browser_command.mojom b/chrome/browser/promo_browser_command/promo_browser_command.mojom
index befc97817..417a1c0 100644
--- a/chrome/browser/promo_browser_command/promo_browser_command.mojom
+++ b/chrome/browser/promo_browser_command/promo_browser_command.mojom
@@ -16,7 +16,7 @@
enum Command {
kUnknownCommand = 0,
kOpenSafetyCheck = 1,
- kOpenSafeBrowsingSettings = 2,
+ kOpenSafeBrowsingEnhancedProtectionSettings = 2,
};
// Click information needed to determine user's desired window disposition using
diff --git a/chrome/browser/ui/webui/new_tab_page/promo_browser_command/promo_browser_command_handler.cc b/chrome/browser/ui/webui/new_tab_page/promo_browser_command/promo_browser_command_handler.cc
index 590ab6e..b9e0be8 100644
--- a/chrome/browser/ui/webui/new_tab_page/promo_browser_command/promo_browser_command_handler.cc
+++ b/chrome/browser/ui/webui/new_tab_page/promo_browser_command/promo_browser_command_handler.cc
@@ -68,8 +68,9 @@
base::RecordAction(
base::UserMetricsAction("NewTabPage_Promos_SafetyCheck"));
break;
- case Command::kOpenSafeBrowsingSettings:
- NavigateToURL(GURL(chrome::GetSettingsUrl(chrome::kSafeBrowsingSubPage)),
+ case Command::kOpenSafeBrowsingEnhancedProtectionSettings:
+ NavigateToURL(GURL(chrome::GetSettingsUrl(
+ chrome::kSafeBrowsingEnhancedProtectionSubPage)),
disposition);
base::RecordAction(
base::UserMetricsAction("NewTabPage_Promos_EnhancedProtection"));
@@ -87,7 +88,8 @@
GetCommandUpdater()->UpdateCommandEnabled(
static_cast<int>(Command::kOpenSafetyCheck), true);
GetCommandUpdater()->UpdateCommandEnabled(
- static_cast<int>(Command::kOpenSafeBrowsingSettings), true);
+ static_cast<int>(Command::kOpenSafeBrowsingEnhancedProtectionSettings),
+ true);
}
CommandUpdater* PromoBrowserCommandHandler::GetCommandUpdater() {
diff --git a/chrome/browser/ui/webui/new_tab_page/promo_browser_command/promo_browser_command_handler_unittest.cc b/chrome/browser/ui/webui/new_tab_page/promo_browser_command/promo_browser_command_handler_unittest.cc
index 4662a89..d82a7bb 100644
--- a/chrome/browser/ui/webui/new_tab_page/promo_browser_command/promo_browser_command_handler_unittest.cc
+++ b/chrome/browser/ui/webui/new_tab_page/promo_browser_command/promo_browser_command_handler_unittest.cc
@@ -193,16 +193,19 @@
EXPECT_TRUE(ExecuteCommand(Command::kOpenSafetyCheck, std::move(info)));
}
-TEST_F(PromoBrowserCommandHandlerTest, OpenSafeBrowsingCommand) {
- // The OpenSafeBRowsing command opens a new settings window with the Safe
- // Browsing settings, and the correct disposition.
+TEST_F(PromoBrowserCommandHandlerTest,
+ OpenSafeBrowsingEnhancedProtectionCommand) {
+ // The kOpenSafeBrowsingEnhancedProtectionSettings command opens a new
+ // settings window with the Safe Browsing settings with the Enhanced
+ // Protection section expanded, and the correct disposition.
ClickInfoPtr info = ClickInfo::New();
info->middle_button = true;
info->meta_key = true;
EXPECT_CALL(
*command_handler_,
- NavigateToURL(GURL(chrome::GetSettingsUrl(chrome::kSafeBrowsingSubPage)),
+ NavigateToURL(GURL(chrome::GetSettingsUrl(
+ chrome::kSafeBrowsingEnhancedProtectionSubPage)),
DispositionFromClick(*info)));
- EXPECT_TRUE(
- ExecuteCommand(Command::kOpenSafeBrowsingSettings, std::move(info)));
+ EXPECT_TRUE(ExecuteCommand(
+ Command::kOpenSafeBrowsingEnhancedProtectionSettings, std::move(info)));
}
diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc
index a7d6289..1911569 100644
--- a/chrome/common/webui_url_constants.cc
+++ b/chrome/common/webui_url_constants.cc
@@ -422,7 +422,6 @@
const char kResetSubPage[] = "reset";
const char kResetProfileSettingsSubPage[] = "resetProfileSettings";
const char kSafeBrowsingEnhancedProtectionSubPage[] = "security?q=enhanced";
-const char kSafeBrowsingSubPage[] = "security";
const char kSafetyCheckSubPage[] = "safetyCheck";
const char kSearchSubPage[] = "search";
const char kSearchEnginesSubPage[] = "searchEngines";
diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h
index 3aa78f411..23decba2 100644
--- a/chrome/common/webui_url_constants.h
+++ b/chrome/common/webui_url_constants.h
@@ -371,7 +371,6 @@
extern const char kResetSubPage[];
extern const char kResetProfileSettingsSubPage[];
extern const char kSafeBrowsingEnhancedProtectionSubPage[];
-extern const char kSafeBrowsingSubPage[];
extern const char kSafetyCheckSubPage[];
extern const char kSearchSubPage[];
extern const char kSearchEnginesSubPage[];
