Fix printer URI generation for printer EULA links

- Previously we appended the license to the os-credits page URL.
- This is incorrect as we need to create the URL with the license
  as a reference fragment. eg. chrome://os-credits/#license
- Update tests to reflect this.

Bug: 1044646
Test: unit + browser tests
Change-Id: I0bbb8067cbffdbcd14ab1ff4b37014c8ef7424ec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2015674
Commit-Queue: jimmy gong <jimmyxgong@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Bailey Berro <baileyberro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736208}

chrome/browser/chromeos/printing/printer_configurer.cc

@@ -25,6 +25,7 @@
 #include "chrome/browser/component_updater/cros_component_installer_chromeos.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_features.h"
+#include "chrome/common/webui_url_constants.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
 #include "chromeos/printing/ppd_provider.h"
@@ -300,6 +301,15 @@ void PrinterConfigurer::SetPrinterConfigurerForTesting(
   g_printer_configurer_for_test = printer_configurer.release();
 }
 
+// static
+GURL PrinterConfigurer::GeneratePrinterEulaUrl(const std::string& license) {
+  GURL eula_url(chrome::kChromeUIOSCreditsURL);
+  // Construct the URL with proper reference fragment.
+  GURL::Replacements replacements;
+  replacements.SetRefStr(license);
+  return eula_url.ReplaceComponents(replacements);
+}
+
 std::ostream& operator<<(std::ostream& out, const PrinterSetupResult& result) {
   switch (result) {
     case kFatalError:

chrome/browser/chromeos/printing/printer_configurer.h

@@ -10,6 +10,7 @@
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
+#include "url/gurl.h"
 
 class Profile;
 
@@ -95,6 +96,10 @@ class PrinterConfigurer {
   static void SetPrinterConfigurerForTesting(
       std::unique_ptr<PrinterConfigurer> printer_configurer);
 
+  // Returns a generated EULA GURL for the provided |license|. |license| is the
+  // identifier tag of the printer's license information.
+  static GURL GeneratePrinterEulaUrl(const std::string& license);
+
  protected:
   PrinterConfigurer() = default;
 

chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos.cc

@@ -26,7 +26,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/print_preview/print_preview_utils.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/common/webui_url_constants.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
 #include "chromeos/printing/printer_configuration.h"
@@ -267,7 +266,7 @@ void LocalPrinterHandlerChromeos::OnResolvedEulaUrl(
     return;
   }
 
-  GURL eula_url(chrome::kChromeUIOSCreditsURL + license);
+  GURL eula_url = chromeos::PrinterConfigurer::GeneratePrinterEulaUrl(license);
   std::move(cb).Run(eula_url.spec());
 }
 

chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos_unittest.cc

@@ -346,7 +346,7 @@ TEST_F(LocalPrinterHandlerChromeosTest, StartFetchValidEulaUrl) {
 
   task_environment_.RunUntilIdle();
 
-  EXPECT_EQ(fetched_eula_url, "chrome://os-credits/expected_make_model");
+  EXPECT_EQ(fetched_eula_url, "chrome://os-credits/#expected_make_model");
 }
 
 // Test that a printer with no PPD license will return an empty string.

chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc

@@ -39,7 +39,6 @@
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/common/webui_url_constants.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/debug_daemon/debug_daemon_client.h"
 #include "chromeos/printing/ppd_line_reader.h"
@@ -1240,7 +1239,7 @@ void CupsPrintersHandler::OnGetEulaUrl(const std::string& callback_id,
     return;
   }
 
-  GURL eula_url(chrome::kChromeUIOSCreditsURL + license);
+  GURL eula_url = PrinterConfigurer::GeneratePrinterEulaUrl(license);
   ResolveJavascriptCallback(
       base::Value(callback_id),
       eula_url.is_valid() ? base::Value(eula_url.spec()) : base::Value());

chrome/test/data/webui/settings/chromeos/cups_printer_page_tests.js

@@ -382,10 +382,7 @@ suite('CupsAddPrinterDialogTests', function() {
     addDialog.$$('.action-button').click();
     Polymer.dom.flush();
 
-    const eulaLink = 'google';
-    const path = window.location.pathname;
-    const expectedEulaLink = window.location.origin +
-        path.slice(0, path.lastIndexOf('/') + 1) + eulaLink;
+    const expectedEulaLink = 'chrome://os-credits/#google';
     const expectedManufacturer = 'Google';
     const expectedModel = 'printer';
     const expectedModel2 = 'newPrinter';
@@ -405,7 +402,7 @@ suite('CupsAddPrinterDialogTests', function() {
           // Check that the EULA text is not shown.
           assertTrue(urlElement.hidden);
 
-          cupsPrintersBrowserProxy.setEulaUrl(eulaLink);
+          cupsPrintersBrowserProxy.setEulaUrl(expectedEulaLink);
 
           modelDialog.$$('#manufacturerDropdown').value = expectedManufacturer;
           modelDropdown = modelDialog.$$('#modelDropdown');
@@ -429,7 +426,7 @@ suite('CupsAddPrinterDialogTests', function() {
           // Check that the EULA text is hidden.
           assertTrue(urlElement.hidden);
 
-          resetGetEulaUrl(cupsPrintersBrowserProxy, eulaLink);
+          resetGetEulaUrl(cupsPrintersBrowserProxy, expectedEulaLink);
 
           // Change ppdModel and expect |getEulaUrl| to be called again.
           modelDropdown.value = expectedModel3;