BASELINE: Update Chromium to 83.0.4103.122

Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

4 files changed, 13 insertions, 19 deletions

diff --git a/chromium/chrome/browser/ui/webui/explore_sites_internals/BUILD.gn b/chromium/chrome/browser/ui/webui/explore_sites_internals/BUILD.gn
index 2278f17b04b..80ac468a3d6 100644
--- a/chromium/chrome/browser/ui/webui/explore_sites_internals/BUILD.gn
+++ b/chromium/chrome/browser/ui/webui/explore_sites_internals/BUILD.gn
@@ -5,7 +5,5 @@
 import("//mojo/public/tools/bindings/mojom.gni")
 
 mojom("mojo_bindings") {
-  sources = [
-    "explore_sites_internals.mojom",
-  ]
+  sources = [ "explore_sites_internals.mojom" ]
 }
diff --git a/chromium/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_page_handler.cc b/chromium/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_page_handler.cc
index b9a460ddfb3..0f6a2b188be 100644
--- a/chromium/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_page_handler.cc
+++ b/chromium/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_page_handler.cc
@@ -8,9 +8,9 @@
 #include <vector>
 
 #include "base/containers/flat_map.h"
-#include "chrome/browser/android/chrome_feature_list.h"
 #include "chrome/browser/android/explore_sites/explore_sites_feature.h"
 #include "chrome/browser/android/explore_sites/url_util.h"
+#include "chrome/browser/flags/android/chrome_feature_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals.mojom.h"
 #include "components/language/core/browser/pref_names.h"
@@ -30,10 +30,6 @@ std::string GetChromeFlagsSetupString() {
       return "Enabled";
     case ExploreSitesVariation::EXPERIMENT:
       return "Experiment";
-    case ExploreSitesVariation::PERSONALIZED:
-      return "Personalized";
-    case ExploreSitesVariation::MOST_LIKELY:
-      return "Most Likely";
     case ExploreSitesVariation::DISABLED:
       return "Disabled";
   }
diff --git a/chromium/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.cc b/chromium/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.cc
index 803dc70251a..502ac7f8a17 100644
--- a/chromium/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.cc
+++ b/chromium/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.cc
@@ -6,8 +6,8 @@
 
 #include "base/bind.h"
 #include "build/build_config.h"
-#include "chrome/browser/android/chrome_feature_list.h"
 #include "chrome/browser/android/explore_sites/explore_sites_service_factory.h"
+#include "chrome/browser/flags/android/chrome_feature_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals.mojom.h"
 #include "chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_page_handler.h"
@@ -35,17 +35,13 @@ ExploreSitesInternalsUI::ExploreSitesInternalsUI(content::WebUI* web_ui)
   explore_sites_service_ =
       ExploreSitesServiceFactory::GetForBrowserContext(profile);
   content::WebUIDataSource::Add(profile, source);
-  // "BindExploreSitesInternalsPageHandler" will be invoked by
-  // explore_sites_internals.js, which is only possible while this object is
-  // alive, so this base::Unretained is safe.
-  AddHandlerToRegistry(base::BindRepeating(
-      &ExploreSitesInternalsUI::BindExploreSitesInternalsPageHandler,
-      base::Unretained(this)));
 }
 
+WEB_UI_CONTROLLER_TYPE_IMPL(ExploreSitesInternalsUI)
+
 ExploreSitesInternalsUI::~ExploreSitesInternalsUI() {}
 
-void ExploreSitesInternalsUI::BindExploreSitesInternalsPageHandler(
+void ExploreSitesInternalsUI::BindInterface(
     mojo::PendingReceiver<explore_sites_internals::mojom::PageHandler>
         receiver) {
   page_handler_ = std::make_unique<ExploreSitesInternalsPageHandler>(
diff --git a/chromium/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.h b/chromium/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.h
index 87fa86d06ec..4aa64b4ae1e 100644
--- a/chromium/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.h
+++ b/chromium/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.h
@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals.mojom.h"
+#include "chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals.mojom-forward.h"
 #include "chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_page_handler.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "ui/webui/mojo_web_ui_controller.h"
@@ -23,14 +23,18 @@ class ExploreSitesInternalsUI : public ui::MojoWebUIController {
   explicit ExploreSitesInternalsUI(content::WebUI* web_ui);
   ~ExploreSitesInternalsUI() override;
 
- private:
-  void BindExploreSitesInternalsPageHandler(
+  // Instantiates the implementor of the mojom::PageHandler mojo
+  // interface passing the pending receiver that will be internally bound.
+  void BindInterface(
       mojo::PendingReceiver<explore_sites_internals::mojom::PageHandler>
           receiver);
 
+ private:
   std::unique_ptr<ExploreSitesInternalsPageHandler> page_handler_;
   ExploreSitesService* explore_sites_service_;
 
+  WEB_UI_CONTROLLER_TYPE_DECL();
+
   DISALLOW_COPY_AND_ASSIGN(ExploreSitesInternalsUI);
 };