OOBE: Eliminate non MD eula UI

This CL removes kChromeUITermsOemURL (chrome://chrome://terms/oem)
which is unused in the MD UI and non functional.

This CL also disables:
WebviewClientCertsLoginTest.ClientCertRequestedInOtherWebView
(See comment for details).

Bug: 647411
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I4bae3abfadd6261fd37a449dcda4a1f37ba4850a
Reviewed-on: https://chromium-review.googlesource.com/1080174
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#564734}

chrome/app/chromium_strings.grd

@@ -216,15 +216,9 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
         Copyright <ph name="YEAR">{0,date,y}<ex>2016</ex></ph> The Chromium Authors. All rights reserved.
       </message>
       <if expr="chromeos">
-        <message name="IDS_ABOUT_VERSION_LICENSE_EULA" desc="The label below the copyright message, containing the URLs.">
-          Chromium open source licenses
-        </message>
         <message name="IDS_ABOUT_CROS_VERSION_LICENSE" desc="Additional text displayed beneath the Chromium open source URLs for Chrome OS.">
           Chromium OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS">&lt;a target="_blank" href="$1"&gt;</ph>open source software<ph name="END_LINK_CROS_OSS">&lt;/a&gt;</ph>.
         </message>
-        <message name="IDS_ABOUT_CROS_VERSION_LICENSE_EULA"  desc="Additional text displayed beneath the Chromium open source URLs for Chrome OS.">
-          Chromium OS open source licenses
-        </message>
       </if>
       <message name="IDS_ABOUT_TERMS_OF_SERVICE" desc="The terms of service label in the About box." translateable="false">
         Not used in Chromium. Placeholder to keep resource maps in sync. It expects one argument: <ph name="ARGUMENT">$1</ph>.

chrome/app/google_chrome_strings.grd

@@ -222,15 +222,9 @@ chromium_strings.grd. -->
         Copyright <ph name="YEAR">{0,date,y}<ex>2016</ex></ph> Google Inc. All rights reserved.
       </message>
       <if expr="chromeos">
-        <message name="IDS_ABOUT_VERSION_LICENSE_EULA" desc="The label below the copyright message, containing the URLs.">
-          Chrome open source licenses
-        </message>
         <message name="IDS_ABOUT_CROS_VERSION_LICENSE" desc="Additional text displayed beneath the Chromium open source URLs for Chrome OS.">
           Chrome OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS">&lt;a target="_blank" href="$1"&gt;</ph>open source software<ph name="END_LINK_CROS_OSS">&lt;/a&gt;</ph>.
         </message>
-        <message name="IDS_ABOUT_CROS_VERSION_LICENSE_EULA"  desc="Additional text displayed beneath the Chromium open source URLs for Chrome OS.">
-          Chrome OS open source licenses
-        </message>
         <message name="IDS_ABOUT_TERMS_OF_SERVICE" desc="The terms of service label in the About box.">
           Google Chrome OS <ph name="TERMS_OF_SERVICE_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Terms of Service<ph name="END_TERMS_OF_SERVICE_LINK">&lt;/a&gt;</ph>
         </message>

chrome/app/resources/locale_settings.grd

@@ -234,16 +234,6 @@
             400
         </message>
 
-        <!-- The EULA credits dialog in pixels. -->
-        <message name="IDS_CREDITS_APP_DIALOG_WIDTH_PIXELS" use_name_for_id="true">
-            710
-        </message>
-
-        <!-- The EULA credits dialog in pixels. -->
-        <message name="IDS_CREDITS_APP_DIALOG_HEIGHT_PIXELS" use_name_for_id="true">
-            500
-        </message>
-
         <message name="IDS_FACTORY_RESET_HELP_URL" translateable="false">
           https://support.google.com/chromebook/answer/183084?hl=[GRITLANGCODE]
         </message>

chrome/browser/chromeos/login/screens/core_oobe_view.h

@@ -31,7 +31,6 @@ class CoreOobeView {
   virtual void ShowPasswordChangedScreen(bool show_password_error,
                                          const std::string& email) = 0;
   virtual void SetUsageStats(bool checked) = 0;
-  virtual void SetOemEulaUrl(const std::string& oem_eula_url) = 0;
   virtual void SetTpmPassword(const std::string& tmp_password) = 0;
   virtual void ClearErrors() = 0;
   virtual void ReloadContent(const base::DictionaryValue& dictionary) = 0;

chrome/browser/chromeos/login/webview_login_browsertest.cc

@@ -833,8 +833,10 @@ IN_PROC_BROWSER_TEST_F(WebviewClientCertsLoginTest,
 // Tests that client certificate authentication is not enabled in a webview on
 // the sign-in screen which is not the sign-in frame. In this case, the EULA
 // webview is used.
+// TODO(pmarko): This is DISABLED because the eula UI it depends on has been
+// deprecated and removed. https://crbug.com/849710.
 IN_PROC_BROWSER_TEST_F(WebviewClientCertsLoginTest,
-                       ClientCertRequestedInOtherWebView) {
+                       DISABLED_ClientCertRequestedInOtherWebView) {
   ASSERT_NO_FATAL_FAILURE(SetUpClientCertInSystemSlot());
   net::SpawnedTestServer::SSLOptions ssl_options;
   ssl_options.request_client_certificate = true;

chrome/browser/resources/chromeos/login/lock.js

@@ -77,7 +77,6 @@ cr.define('cr.ui.Oobe', function() {
     handleHighContrastClick: function(e) {},
     handleScreenMagnifierClick: function(e) {},
     setUsageStats: function(checked) {},
-    setOemEulaUrl: function(oemEulaUrl) {},
     setTpmPassword: function(password) {},
     refreshA11yInfo: function(data) {},
     reloadEulaContent: function(data) {},

chrome/browser/resources/chromeos/login/login.js

@@ -72,7 +72,6 @@ cr.define('cr.ui.Oobe', function() {
     handleHighContrastClick: function(e) {},
     handleScreenMagnifierClick: function(e) {},
     setUsageStats: function(checked) {},
-    setOemEulaUrl: function(oemEulaUrl) {},
     setTpmPassword: function(password) {},
     refreshA11yInfo: function(data) {},
     reloadEulaContent: function(data) {},

chrome/browser/resources/chromeos/login/login_non_lock_shared.html

@@ -7,7 +7,6 @@ screen, it should be added to login_shared.html
 <link rel="stylesheet" href="network_dropdown.css">
 
 <link rel="stylesheet" href="oobe_screen_enable_debugging.css">
-<link rel="stylesheet" href="oobe_screen_eula.css">
 <link rel="stylesheet" href="oobe_screen_eula_installation_settings_overlay.css">
 <link rel="stylesheet" href="oobe_screen_network.css">
 <link rel="stylesheet" href="oobe_screen_reset.css">

chrome/browser/resources/chromeos/login/md_lock.js

@@ -82,7 +82,6 @@ cr.define('cr.ui.Oobe', function() {
     handleHighContrastClick: function(e) {},
     handleScreenMagnifierClick: function(e) {},
     setUsageStats: function(checked) {},
-    setOemEulaUrl: function(oemEulaUrl) {},
     setTpmPassword: function(password) {},
     refreshA11yInfo: function(data) {},
     reloadEulaContent: function(data) {},

chrome/browser/resources/chromeos/login/md_login.js

@@ -80,7 +80,6 @@ cr.define('cr.ui.Oobe', function() {
     handleHighContrastClick: function(e) {},
     handleScreenMagnifierClick: function(e) {},
     setUsageStats: function(checked) {},
-    setOemEulaUrl: function(oemEulaUrl) {},
     setTpmPassword: function(password) {},
     refreshA11yInfo: function(data) {},
     reloadEulaContent: function(data) {},

chrome/browser/resources/chromeos/login/oobe.js

@@ -81,15 +81,12 @@ cr.define('cr.ui.Oobe', function() {
       cr.ui.Bubble.decorate($('accessibility-menu'));
       $('connect-accessibility-link')
           .addEventListener('click', Oobe.handleAccessibilityLinkClick);
-      $('eula-accessibility-link')
-          .addEventListener('click', Oobe.handleAccessibilityLinkClick);
       // Same behaviour on hitting spacebar. See crbug.com/342991.
       function reactOnSpace(event) {
         if (event.keyCode == 32)
           Oobe.handleAccessibilityLinkClick(event);
       }
       $('connect-accessibility-link').addEventListener('keyup', reactOnSpace);
-      $('eula-accessibility-link').addEventListener('keyup', reactOnSpace);
 
       $('high-contrast')
           .addEventListener('click', Oobe.handleHighContrastClick);
@@ -213,18 +210,9 @@ cr.define('cr.ui.Oobe', function() {
      * @param {boolean} checked Is the checkbox checked?
      */
     setUsageStats: function(checked) {
-      $('usage-stats').checked = checked;
       $('oobe-eula-md').usageStatsChecked = checked;
     },
 
-    /**
-     * Set OEM EULA URL.
-     * @param {text} oemEulaUrl OEM EULA URL.
-     */
-    setOemEulaUrl: function(oemEulaUrl) {
-      $('eula').setOemEulaUrl(oemEulaUrl);
-    },
-
     /**
      * Sets TPM password.
      * @param {text} password TPM password to be shown.

chrome/browser/resources/chromeos/login/oobe_screen_eula.css

-/* Copyright 2013 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file. */
-
-#eula {
-  min-height: 395px;
-  padding: 70px 17px 21px;
-}
-
-#oobe[md-mode] #eula {
-  min-height: unset;
-  padding: unset;
-}
-
-#cros-eula,
-#oem-eula {
-  border: 1px solid #d9d9d9;
-  height: 222px;
-}
-
-.eula-frame {
-  border: none;
-  height: 222px;
-}
-
-#logging {
-  clear: both;
-  font-size: small;
-  margin-top: 20px;
-  width: 620px;
-}
-
-#logging div {
-  display: table-cell;
-  vertical-align: middle;
-}
-
-#usage-stats {
-  -webkit-margin-end: 10px;
-}
-
-.eula-columns {
-  display: -webkit-box;
-  width: 630px;
-}
-
-#cros-eula {
-  width: 314px;
-}
-
-#cros-eula-frame {
-  width: 309px;
-}
-
-#oem-eula {
-  border-left: none;
-  width: 313px;
-}
-
-#oem-eula-frame {
-  width: 308px;
-}
-
-#eulas.one-column #cros-eula {
-  width: 628px;
-}
-
-#eulas.one-column #cros-eula-frame {
-  width: 623px;
-}
-
-#eulas.one-column #oem-eula {
-  display: none;
-}
-
-#eula #stats-help-link {
-  color: rgb(49, 106, 197);
-}
-
-#eula .step-contents {
-  -webkit-margin-start: 32px;
-  margin-bottom: 30px;
-}
-
-#eula .credits {
-  clear: both;
-  font-size: small;
-}
-
-#cros-eula-loading {
-  -webkit-align-items: center;
-  -webkit-flex-direction: column;
-  -webkit-justify-content: center;
-  display: none;
-  height: 100%;
-  width: 100%;
-}
-
-.step.eula-loading #cros-eula-frame {
-  display: none;
-}
-
-.step.eula-loading #cros-eula-loading {
-  display: -webkit-flex;
-}

chrome/browser/resources/chromeos/login/oobe_screen_eula.html

 <div class="step right hidden animated eula-loading" id="eula" role="group"
      i18n-values="aria-label:eulaScreenAccessibleTitle" hidden>
-  <oobe-eula-md id="oobe-eula-md" hidden></oobe-eula-md>
-  <div id="oobe-eula">
-    <div class="step-contents">
-      <div id="eulas" class="eula-columns one-column">
-        <div id="cros-eula" tabindex="0">
-          <webview id="cros-eula-frame" name="cros-eula-frame"
-              class="eula-frame"></webview>
-          <div id="cros-eula-loading">
-            <div>
-              <p i18n-content="termsOfServiceLoading"></p>
-            </div>
-          </div>
-        </div>
-        <div id="oem-eula">
-          <webview id="oem-eula-frame" name="oem-eula-frame" class="eula-frame">
-          </webview>
-        </div>
-      </div>
-      <div id="logging">
-        <div>
-          <input aria-labelledby="usage-stats-label" id="usage-stats"
-              type="checkbox">
-        </div>
-        <div>
-          <label id="usage-stats-label" i18n-content="checkboxLogging"></label>
-          <a id="stats-help-link" href="#" i18n-content="learnMore"></a>
-        </div>
-      </div>
-    </div>
-    <div id="eula-controls" class="step-controls"></div>
-    <div id="eula-extra-controls" class="step-extra-controls">
-      <div id="installation-settings">
-        <a id="installation-settings-link" href="#"
-           i18n-content="eulaSystemInstallationSettings">
-        </a>
-      </div>
-      <div id="eula-accessibility">
-        <a id="eula-accessibility-link" href="#" role="button"
-          i18n-content="accessibilityLink"></a>
-      </div>
-      <div id="eula-chrome-credits"
-          class="credits"><a id="eula-chrome-credits-link" href="#"
-          role="button" i18n-content="chromeCreditsLink"></a></div>
-      <div id="eula-chromeos-credits"
-          class="credits"><a id="eula-chromeos-credits-link" href="#"
-          role="button" i18n-content="chromeosCreditsLink"></a></div>
-    </div>
-    <div id="eula-busy" class="step-loading">
-      <div class="throbber"></div>
-    </div>
-  </div>
+  <oobe-eula-md id="oobe-eula-md"></oobe-eula-md>
 </div>

chrome/browser/resources/chromeos/login/oobe_screen_eula.js

@@ -149,43 +149,13 @@ login.createScreen('EulaScreen', 'eula', function() {
   PendingLoad.ATTACHED_PROPERTY_NAME = 'pendingLoad';
 
   return {
-    /**
-     * Tracks OEM Eula url so that it could be properly reloaded.
-     * @type {?string}
-     */
-    oemEulaUrl_: null,
-
     /** @override */
     decorate: function() {
-      $('eula-chrome-credits-link').hidden = true;
-      $('eula-chromeos-credits-link').hidden = true;
-      $('stats-help-link').addEventListener('click', function(event) {
-        chrome.send('eulaOnLearnMore');
-      });
-      $('installation-settings-link')
-          .addEventListener('click', function(event) {
-            chrome.send('eulaOnInstallationSettingsPopupOpened');
-            $('popup-overlay').hidden = false;
-            $('installation-settings-ok-button').focus();
-          });
-      $('installation-settings-ok-button')
-          .addEventListener('click', function(event) {
-            $('popup-overlay').hidden = true;
-          });
-
-      $('cros-eula-frame')
-          .addEventListener('contentload', this.onFrameLoad.bind(this));
-
-      var self = this;
-      $('usage-stats').addEventListener('click', function(event) {
-        self.onUsageStatsClicked_($('usage-stats').checked);
-        event.stopPropagation();
-      });
       $('oobe-eula-md').screen = this;
     },
 
     /**
-     * Event handler for $('usage-stats') click event.
+     * Called from $('oobe-eula-md') onUsageChanged handler.
      * @param {boolean} value $('usage-stats').checked value.
      */
     onUsageStatsClicked_: function(value) {
@@ -197,14 +167,7 @@ login.createScreen('EulaScreen', 'eula', function() {
      * Event handler that is invoked when 'chrome://terms' is loaded.
      */
     onFrameLoad: function() {
-      $('accept-button').disabled = false;
       $('eula').classList.remove('eula-loading');
-      // Initially, the back button is focused and the accept button is
-      // disabled.
-      // Move the focus to the accept button now but only if the user has not
-      // moved the focus anywhere in the meantime.
-      if (!$('back-button').blurred)
-        $('accept-button').focus();
     },
 
     /**
@@ -213,7 +176,6 @@ login.createScreen('EulaScreen', 'eula', function() {
      */
     onBeforeShow: function() {
       $('eula').classList.add('eula-loading');
-      $('accept-button').disabled = true;
       this.updateLocalizedContent();
     },
 
@@ -225,31 +187,6 @@ login.createScreen('EulaScreen', 'eula', function() {
       return loadTimeData.getString('eulaScreenTitle');
     },
 
-    /**
-     * Buttons in oobe wizard's button strip.
-     * @type {Array} Array of Buttons.
-     */
-    get buttons() {
-      var buttons = [];
-
-      var backButton = this.declareButton('back-button');
-      backButton.textContent = loadTimeData.getString('back');
-      buttons.push(backButton);
-
-      var acceptButton = this.declareButton('accept-button');
-      acceptButton.disabled = true;
-      acceptButton.classList.add('preserve-disabled-state');
-      acceptButton.textContent = loadTimeData.getString('acceptAgreement');
-      acceptButton.addEventListener('click', function(e) {
-        $('eula').classList.add('loading');  // Mark EULA screen busy.
-        Oobe.clearErrors();
-        e.stopPropagation();
-      });
-      buttons.push(acceptButton);
-
-      return buttons;
-    },
-
     /**
      * Returns a control which should receive an initial focus.
      */
@@ -257,58 +194,20 @@ login.createScreen('EulaScreen', 'eula', function() {
       return $('oobe-eula-md');
     },
 
-    enableKeyboardFlow: function() {
-      $('eula-chrome-credits-link').hidden = false;
-      $('eula-chromeos-credits-link').hidden = false;
-      $('eula-chrome-credits-link').addEventListener('click', function(event) {
-        chrome.send('eulaOnChromeCredits');
-      });
-      $('eula-chromeos-credits-link')
-          .addEventListener('click', function(event) {
-            chrome.send('eulaOnChromeOSCredits');
-          });
-    },
+    enableKeyboardFlow: function() {},
 
     /**
      * This method takes care of switching to material-design OOBE.
      * @private
      */
-    setMDMode_: function() {
-      $('oobe-eula-md').hidden = false;
-      // TODO(stevenjb): Remove oobe-eula. https://crbug.com/647411.
-      $('oobe-eula').hidden = true;
-    },
+    setMDMode_: function() {},
 
     /**
      * Updates localized content of the screen that is not updated via template.
      */
     updateLocalizedContent: function() {
-      this.setMDMode_();
-
       // Reload the terms contents.
-      if (!$('oobe-eula-md').hidden)
-        $('oobe-eula-md').updateLocalizedContent();
-
-      if (!$('oobe-eula').hidden) {
-        this.loadEulaToWebview_($('cros-eula-frame'));
-        if (this.oemEulaUrl_)
-          loadUrlToWebview($('oem-eula-frame'), this.oemEulaUrl_);
-      }
-    },
-
-    /**
-     * Sets url for OEM Eula. Oem Eula UI is hidden if the url is null or empty.
-     * @param {?string} oemEulaUrl The URL for OEM Eula.
-     */
-    setOemEulaUrl: function(oemEulaUrl) {
-      this.oemEulaUrl_ = oemEulaUrl;
-
-      if (this.oemEulaUrl_) {
-        loadUrlToWebview($('oem-eula-frame'), this.oemEulaUrl_);
-        $('eulas').classList.remove('one-column');
-      } else {
-        $('eulas').classList.add('one-column');
-      }
+      $('oobe-eula-md').updateLocalizedContent();
     },
 
     /**
@@ -374,11 +273,7 @@ login.createScreen('EulaScreen', 'eula', function() {
      * Called when focus is returned.
      */
     onFocusReturned: function() {
-      if ($('oobe-eula') && !$('oobe-eula').hidden) {
-        $('oobe-eula').focus();
-      } else if ($('oobe-eula-md') && !$('oobe-eula-md').hidden) {
-        $('oobe-eula-md').focus();
-      }
+      $('oobe-eula-md').focus();
     },
   };
 });

chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

@@ -257,10 +257,6 @@ void CoreOobeHandler::SetUsageStats(bool checked) {
   CallJSOrDefer("setUsageStats", checked);
 }
 
-void CoreOobeHandler::SetOemEulaUrl(const std::string& oem_eula_url) {
-  CallJSOrDefer("setOemEulaUrl", oem_eula_url);
-}
-
 void CoreOobeHandler::SetTpmPassword(const std::string& tpm_password) {
   CallJSOrDefer("setTpmPassword", tpm_password);
 }

chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h

@@ -94,7 +94,6 @@ class CoreOobeHandler : public BaseWebUIHandler,
   void ShowPasswordChangedScreen(bool show_password_error,
                                  const std::string& email) override;
   void SetUsageStats(bool checked) override;
-  void SetOemEulaUrl(const std::string& oem_eula_url) override;
   void SetTpmPassword(const std::string& tmp_password) override;
   void ClearErrors() override;
   void ReloadContent(const base::DictionaryValue& dictionary) override;

chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc

@@ -9,80 +9,24 @@
 
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
-#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/oobe_screen.h"
 #include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
 #include "chrome/browser/chromeos/login/screens/eula_screen.h"
-#include "chrome/browser/chromeos/login/ui/login_display_webui.h"
-#include "chrome/browser/chromeos/login/ui/login_web_dialog.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
-#include "chrome/grit/locale_settings.h"
 #include "components/login/localized_values_builder.h"
 #include "components/strings/grit/components_strings.h"
-#include "content/public/browser/web_contents.h"
 #include "rlz/buildflags/buildflags.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/views/widget/widget.h"
 #include "url/gurl.h"
 
 namespace {
-
 constexpr char kJsScreenPath[] = "login.EulaScreen";
-
-// Helper class to tweak display details of credits pages in the context
-// of OOBE/EULA step.
-class CreditsWebDialog : public chromeos::LoginWebDialog {
- public:
-  CreditsWebDialog(Profile* profile,
-                   gfx::NativeWindow parent_window,
-                   int title_id,
-                   const GURL& url)
-      : chromeos::LoginWebDialog(profile, NULL, parent_window,
-                                 l10n_util::GetStringUTF16(title_id),
-                                 url) {
-  }
-
-  void OnLoadingStateChanged(content::WebContents* source) override {
-    chromeos::LoginWebDialog::OnLoadingStateChanged(source);
-    // Remove visual elements that we can handle in EULA page.
-    bool is_loading = source->IsLoading();
-    if (!is_loading && source->GetWebUI()) {
-      source->GetWebUI()->CallJavascriptFunctionUnsafe(
-          "(function () {"
-          "  document.body.classList.toggle('dialog', true);"
-          "  keyboard.initializeKeyboardFlow(false);"
-          "})");
-    }
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(CreditsWebDialog);
-};
-
-void ShowCreditsDialog(Profile* profile,
-                       gfx::NativeWindow parent_window,
-                       int title_id,
-                       const GURL& credits_url) {
-  CreditsWebDialog* dialog = new CreditsWebDialog(profile,
-                                                  parent_window,
-                                                  title_id,
-                                                  credits_url);
-  dialog->SetDialogSize(l10n_util::GetLocalizedContentsWidthInPixels(
-                            IDS_CREDITS_APP_DIALOG_WIDTH_PIXELS),
-                        l10n_util::GetLocalizedContentsWidthInPixels(
-                            IDS_CREDITS_APP_DIALOG_HEIGHT_PIXELS));
-  dialog->Show();
-  // The dialog object will be deleted on dialog close.
 }
 
-}  // namespace
-
 namespace chromeos {
 
 EulaScreenHandler::EulaScreenHandler(CoreOobeView* core_oobe_view)
@@ -156,9 +100,6 @@ void EulaScreenHandler::DeclareLocalizedValues(
       base::StringPrintf(chrome::kOnlineEulaURLPath,
                          g_browser_process->GetApplicationLocale().c_str()));
 
-  builder->Add("chromeCreditsLink", IDS_ABOUT_VERSION_LICENSE_EULA);
-  builder->Add("chromeosCreditsLink", IDS_ABOUT_CROS_VERSION_LICENSE_EULA);
-
   /* MD-OOBE */
   builder->Add("oobeEulaSectionTitle", IDS_OOBE_EULA_SECTION_TITLE);
   builder->Add("oobeEulaIframeLabel", IDS_OOBE_EULA_IFRAME_LABEL);
@@ -167,10 +108,6 @@ void EulaScreenHandler::DeclareLocalizedValues(
 }
 
 void EulaScreenHandler::DeclareJSCallbacks() {
-  AddCallback("eulaOnLearnMore", &EulaScreenHandler::HandleOnLearnMore);
-  AddCallback("eulaOnChromeOSCredits",
-              &EulaScreenHandler::HandleOnChromeOSCredits);
-  AddCallback("eulaOnChromeCredits", &EulaScreenHandler::HandleOnChromeCredits);
   AddCallback("eulaOnLearnMore", &EulaScreenHandler::HandleOnLearnMore);
   AddCallback("eulaOnInstallationSettingsPopupOpened",
               &EulaScreenHandler::HandleOnInstallationSettingsPopupOpened);
@@ -190,11 +127,6 @@ void EulaScreenHandler::Initialize() {
 
   core_oobe_view_->SetUsageStats(screen_->IsUsageStatsEnabled());
 
-  // This OEM EULA is a file:// URL which we're unable to load in iframe.
-  // Instead if it's defined we use chrome://terms/oem that will load same file.
-  if (!screen_->GetOemEulaUrl().is_empty())
-    core_oobe_view_->SetOemEulaUrl(chrome::kChromeUITermsOemURL);
-
   if (show_on_init_) {
     Show();
     show_on_init_ = false;
@@ -211,24 +143,6 @@ void EulaScreenHandler::HandleOnLearnMore() {
   help_app_->ShowHelpTopic(HelpAppLauncher::HELP_STATS_USAGE);
 }
 
-void EulaScreenHandler::HandleOnChromeOSCredits() {
-  ShowCreditsDialog(
-      Profile::FromBrowserContext(
-          web_ui()->GetWebContents()->GetBrowserContext()),
-      GetNativeWindow(),
-      IDS_ABOUT_CROS_VERSION_LICENSE_EULA,
-      GURL(chrome::kChromeUIOSCreditsURL));
-}
-
-void EulaScreenHandler::HandleOnChromeCredits() {
-  ShowCreditsDialog(
-      Profile::FromBrowserContext(
-          web_ui()->GetWebContents()->GetBrowserContext()),
-      GetNativeWindow(),
-      IDS_ABOUT_VERSION_LICENSE_EULA,
-      GURL(chrome::kChromeUICreditsURL));
-}
-
 void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened() {
   if (screen_)
     screen_->InitiatePasswordFetch();

chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h

@@ -49,8 +49,6 @@ class EulaScreenHandler : public EulaView,
  private:
   // JS messages handlers.
   void HandleOnLearnMore();
-  void HandleOnChromeCredits();
-  void HandleOnChromeOSCredits();
   void HandleOnInstallationSettingsPopupOpened();
 
   void UpdateLocalizedValues(::login::SecureModuleUsed secure_module_used);

chrome/common/webui_url_constants.cc

@@ -218,7 +218,6 @@ const char kChromeUISlowHost[] = "slow";
 const char kChromeUISlowTraceHost[] = "slow_trace";
 const char kChromeUISlowURL[] = "chrome://slow/";
 const char kChromeUISysInternalsHost[] = "sys-internals";
-const char kChromeUITermsOemURL[] = "chrome://terms/oem";
 const char kChromeUIUserImageHost[] = "userimage";
 const char kChromeUIUserImageURL[] = "chrome://userimage/";
 const char kChromeUIAssistantOptInHost[] = "assistant-optin";

chrome/common/webui_url_constants.h

@@ -213,7 +213,6 @@ extern const char kChromeUISlowHost[];
 extern const char kChromeUISlowTraceHost[];
 extern const char kChromeUISlowURL[];
 extern const char kChromeUISysInternalsHost[];
-extern const char kChromeUITermsOemURL[];
 extern const char kChromeUIUserImageHost[];
 extern const char kChromeUIUserImageURL[];
 extern const char kChromeUIAssistantOptInHost[];