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.

Bug: 1130722
Change-Id: I646566199755862055e8be0fba00259ecf48d704
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2454404Reviewed-by: Mustafa Emre Acer <meacer@chromium.org>
Reviewed-by: Xinghui Lu <xinghuilu@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Bettina Dea <bdea@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815066}

chrome/browser/about_flags.cc

@@ -1493,16 +1493,17 @@ const FeatureEntry::FeatureParam
     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[] = {

chrome/browser/promo_browser_command/promo_browser_command.mojom

@@ -16,7 +16,7 @@ module promo_browser_command.mojom;
 enum Command {
   kUnknownCommand = 0,
   kOpenSafetyCheck = 1,
-  kOpenSafeBrowsingSettings = 2,
+  kOpenSafeBrowsingEnhancedProtectionSettings = 2,
 };
 
 // Click information needed to determine user's desired window disposition using

chrome/browser/ui/webui/new_tab_page/promo_browser_command/promo_browser_command_handler.cc

@@ -68,8 +68,9 @@ void PromoBrowserCommandHandler::ExecuteCommandWithDisposition(
       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 @@ void PromoBrowserCommandHandler::EnableCommands() {
   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() {

chrome/browser/ui/webui/new_tab_page/promo_browser_command/promo_browser_command_handler_unittest.cc

@@ -193,16 +193,19 @@ TEST_F(PromoBrowserCommandHandlerTest, OpenSafetyCheckCommand) {
   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)));
 }

chrome/common/webui_url_constants.cc

@@ -423,7 +423,6 @@ const char kPrivacySubPage[] = "privacy";
 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";

chrome/common/webui_url_constants.h

@@ -373,7 +373,6 @@ extern const char kPrivacySubPage[];
 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[];