BASELINE: Update Chromium to 108.0.5359.70

Change-Id: I77334ff232b819600f275bd3cfe41fbaa3619230
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/445904
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

7 files changed, 81 insertions, 42 deletions

diff --git a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
index a8421701522..fa018f7b114 100644
--- a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn
@@ -1,7 +1,12 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
+# Copyright 2016 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# TODO(crbug.com/1344830): Migrate away from deprecated MDC APIs.
+config("disable_deprecated_declarations") {
+  cflags = [ "-Wno-deprecated-declarations" ]
+}
+
 source_set("ntp") {
   sources = [
     "discover_feed_preview_delegate.h",
@@ -19,7 +24,6 @@ source_set("ntp") {
     ":constants",
     ":feature_flags",
   ]
-  deps = [ "//ios/chrome/browser/ui/util" ]
 }
 
 source_set("logo") {
@@ -60,10 +64,10 @@ source_set("coordinator") {
     "//components/prefs",
     "//components/prefs/ios",
     "//components/search_engines",
+    "//components/signin/public/identity_manager/objc",
     "//ios/chrome/app:tests_hook",
     "//ios/chrome/app/application_delegate:app_state_header",
     "//ios/chrome/app/strings",
-    "//ios/chrome/browser:pref_names",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/discover_feed",
     "//ios/chrome/browser/discover_feed:discover_feed_factory",
@@ -72,6 +76,7 @@ source_set("coordinator") {
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/ntp",
     "//ios/chrome/browser/ntp:features",
+    "//ios/chrome/browser/prefs:pref_names",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
     "//ios/chrome/browser/signin",
@@ -85,11 +90,12 @@ source_set("coordinator") {
     "//ios/chrome/browser/ui/context_menu/link_preview",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/follow",
+    "//ios/chrome/browser/ui/main:layout_guide_util",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/ui/main:scene_state_observer",
-    "//ios/chrome/browser/ui/ntp:metrics",
     "//ios/chrome/browser/ui/ntp/feed_management",
     "//ios/chrome/browser/ui/ntp/feed_top_section",
+    "//ios/chrome/browser/ui/ntp/metrics",
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/util",
@@ -112,12 +118,16 @@ source_set("util") {
   deps = [
     "//ios/chrome/browser",
     "//ios/chrome/browser/ntp",
+    "//ios/chrome/browser/url:constants",
     "//ios/web/public",
   ]
 }
 
 source_set("ntp_internal") {
-  configs += [ "//build/config/compiler:enable_arc" ]
+  configs += [
+    ":disable_deprecated_declarations",
+    "//build/config/compiler:enable_arc",
+  ]
   sources = [
     "feed_header_view_controller.h",
     "feed_header_view_controller.mm",
@@ -128,13 +138,9 @@ source_set("ntp_internal") {
     "incognito_view.mm",
     "incognito_view_controller.h",
     "incognito_view_controller.mm",
-    "metrics.h",
-    "metrics.mm",
     "new_tab_page_url_loader_delegate.h",
     "new_tab_page_view_controller.h",
     "new_tab_page_view_controller.mm",
-    "notification_promo_whats_new.h",
-    "notification_promo_whats_new.mm",
     "ntp_tile_saver.h",
     "ntp_tile_saver.mm",
     "revamped_incognito_view.h",
@@ -142,7 +148,6 @@ source_set("ntp_internal") {
   ]
   deps = [
     ":logo",
-    ":metrics",
     ":ntp",
     "resources:fake_omnibox_bottom_gradient_color",
     "resources:fake_omnibox_top_gradient_color",
@@ -178,6 +183,7 @@ source_set("ntp_internal") {
     "//ios/chrome/browser/discover_feed:constants",
     "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/favicon",
+    "//ios/chrome/browser/flags:system_flags",
     "//ios/chrome/browser/history",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/metrics:metrics_internal",
@@ -199,6 +205,7 @@ source_set("ntp_internal") {
     "//ios/chrome/browser/ui/gestures",
     "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/ntp/feed_top_section",
+    "//ios/chrome/browser/ui/ntp/metrics",
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/thumb_strip:public",
@@ -230,36 +237,16 @@ source_set("ntp_internal") {
   ]
 }
 
-source_set("metrics") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "feed_metrics_recorder.h",
-    "feed_metrics_recorder.mm",
-    "feed_session_recorder.h",
-    "feed_session_recorder.mm",
-  ]
-  deps = [
-    ":ntp",
-    "//base",
-    "//components/feed/core/v2/public:common",
-    "//ios/chrome/browser/discover_feed:constants",
-    "//ios/chrome/browser/ui/content_suggestions:metrics",
-  ]
-}
-
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
-    "feed_session_recorder_unittest.mm",
     "new_tab_page_coordinator_unittest.mm",
-    "notification_promo_whats_new_unittest.mm",
     "ntp_tile_saver_unittest.mm",
   ]
   deps = [
     ":coordinator",
     ":feature_flags",
-    ":metrics",
     ":ntp",
     ":ntp_internal",
     "//base",
@@ -271,7 +258,6 @@ source_set("unit_tests") {
     "//components/search_engines",
     "//components/sessions",
     "//components/variations",
-    "//ios/chrome/app/strings",
     "//ios/chrome/browser",
     "//ios/chrome/browser/bookmarks",
     "//ios/chrome/browser/browser_state:test_support",
@@ -318,11 +304,11 @@ source_set("eg2_tests") {
     "//components/policy/core/common:test_support",
     "//components/strings",
     "//ios/chrome/app/strings",
-    "//ios/chrome/browser:chrome_url_constants",
     "//ios/chrome/browser/metrics:eg_test_support+eg2",
     "//ios/chrome/browser/policy:eg_test_support+eg2",
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/popup_menu:constants",
+    "//ios/chrome/browser/url:constants",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",
     "//ios/testing/earl_grey:eg_test_support+eg2",
     "//ios/third_party/earl_grey2:test_lib",
@@ -338,6 +324,10 @@ source_set("feature_flags") {
     "new_tab_page_feature.h",
     "new_tab_page_feature.mm",
   ]
-  deps = [ "//ios/chrome/browser/ui/content_suggestions:feature_flags" ]
+  deps = [
+    "//components/prefs",
+    "//ios/chrome/browser/prefs:pref_names",
+    "//ios/chrome/browser/ui/content_suggestions:feature_flags",
+  ]
   public_deps = [ "//base" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/ntp/feed_management/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/feed_management/BUILD.gn
index 55e40b9420c..f70fac115d7 100644
--- a/chromium/ios/chrome/browser/ui/ntp/feed_management/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/feed_management/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2022 The Chromium Authors. All rights reserved.
+# Copyright 2022 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -18,7 +18,7 @@ source_set("feed_management") {
     "//ios/chrome/browser/net:crurl",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/follow",
-    "//ios/chrome/browser/ui/ntp:metrics",
+    "//ios/chrome/browser/ui/ntp/metrics",
     "//ios/chrome/browser/ui/table_view",
   ]
   public_deps = [ ":navigation_delegate" ]
@@ -33,7 +33,7 @@ source_set("feed_management_ui") {
   configs += [ "//build/config/compiler:enable_arc" ]
   deps = [
     ":navigation_delegate",
-    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ui/base",
@@ -78,11 +78,11 @@ source_set("follow_management_ui") {
     ":feed_management_ui",
     "resources:following_empty",
     "//base",
-    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/app/strings",
     "//ios/chrome/browser/net:crurl",
     "//ios/chrome/browser/ui/follow",
-    "//ios/chrome/browser/ui/ntp:metrics",
     "//ios/chrome/browser/ui/ntp/feed_management:navigation_delegate",
+    "//ios/chrome/browser/ui/ntp/metrics",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/common/ui/favicon",
     "//ui/base",
diff --git a/chromium/ios/chrome/browser/ui/ntp/feed_management/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/feed_management/resources/BUILD.gn
index ab9902e387a..75bb2ea6b0c 100644
--- a/chromium/ios/chrome/browser/ui/ntp/feed_management/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/feed_management/resources/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2022 The Chromium Authors. All rights reserved.
+# Copyright 2022 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/chromium/ios/chrome/browser/ui/ntp/feed_top_section/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/feed_top_section/BUILD.gn
index fadf3dfa308..f990ef4bef8 100644
--- a/chromium/ios/chrome/browser/ui/ntp/feed_top_section/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/feed_top_section/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2022 The Chromium Authors. All rights reserved.
+# Copyright 2022 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/chromium/ios/chrome/browser/ui/ntp/feed_top_section/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/feed_top_section/resources/BUILD.gn
index dc85b376af6..57028805dc6 100644
--- a/chromium/ios/chrome/browser/ui/ntp/feed_top_section/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/feed_top_section/resources/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2022 The Chromium Authors. All rights reserved.
+# Copyright 2022 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
diff --git a/chromium/ios/chrome/browser/ui/ntp/metrics/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/metrics/BUILD.gn
new file mode 100644
index 00000000000..cf4385f37af
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/ntp/metrics/BUILD.gn
@@ -0,0 +1,49 @@
+# Copyright 2022 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("metrics") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "feed_metrics_constants.h",
+    "feed_metrics_constants.mm",
+    "feed_metrics_recorder.h",
+    "feed_metrics_recorder.mm",
+    "feed_session_recorder+testing.h",
+    "feed_session_recorder.h",
+    "feed_session_recorder.mm",
+    "metrics.h",
+    "metrics.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/favicon_base",
+    "//components/feed/core/v2/public:common",
+    "//components/ntp_tiles",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/discover_feed:constants",
+    "//ios/chrome/browser/ntp:features",
+    "//ios/chrome/browser/ui/content_suggestions:metrics",
+    "//ios/chrome/browser/ui/favicon",
+    "//ios/chrome/browser/ui/ntp",
+    "//ios/chrome/common/ui/favicon",
+    "//url",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [ "feed_session_recorder_unittest.mm" ]
+  deps = [
+    ":metrics",
+    "//base",
+    "//base/test:test_support",
+    "//ios/chrome/test:test_support",
+    "//ios/web/public/test",
+    "//testing/gtest",
+    "//third_party/ocmock",
+    "//ui/base",
+    "//ui/base:test_support",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/ntp/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/resources/BUILD.gn
index 72803fef87a..49ff4404d34 100644
--- a/chromium/ios/chrome/browser/ui/ntp/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/ntp/resources/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2017 The Chromium Authors. All rights reserved.
+# Copyright 2017 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.