BASELINE: Update Chromium to 96.0.4664.181

Change-Id: I762cd1da89d73aa6313b4a753fe126c34833f046
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

9 files changed, 33 insertions, 18 deletions

diff --git a/chromium/components/infobars/android/confirm_infobar.h b/chromium/components/infobars/android/confirm_infobar.h
index 0bdf5607250..261d70a2f19 100644
--- a/chromium/components/infobars/android/confirm_infobar.h
+++ b/chromium/components/infobars/android/confirm_infobar.h
@@ -17,6 +17,10 @@ namespace infobars {
 class ConfirmInfoBar : public InfoBarAndroid {
  public:
   explicit ConfirmInfoBar(std::unique_ptr<ConfirmInfoBarDelegate> delegate);
+
+  ConfirmInfoBar(const ConfirmInfoBar&) = delete;
+  ConfirmInfoBar& operator=(const ConfirmInfoBar&) = delete;
+
   ~ConfirmInfoBar() override;
 
  protected:
@@ -32,9 +36,6 @@ class ConfirmInfoBar : public InfoBarAndroid {
                      const base::android::JavaParamRef<jobject>& obj) override;
 
   void ProcessButton(int action) override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ConfirmInfoBar);
 };
 
 }  // namespace infobars
diff --git a/chromium/components/infobars/android/infobar_android.h b/chromium/components/infobars/android/infobar_android.h
index 38881e8c4b4..f09a209a24a 100644
--- a/chromium/components/infobars/android/infobar_android.h
+++ b/chromium/components/infobars/android/infobar_android.h
@@ -31,6 +31,10 @@ class InfoBarAndroid : public InfoBar {
   using ResourceIdMapper = base::RepeatingCallback<int(int)>;
 
   explicit InfoBarAndroid(std::unique_ptr<InfoBarDelegate> delegate);
+
+  InfoBarAndroid(const InfoBarAndroid&) = delete;
+  InfoBarAndroid& operator=(const InfoBarAndroid&) = delete;
+
   ~InfoBarAndroid() override;
 
   // InfoBar:
@@ -68,8 +72,6 @@ class InfoBarAndroid : public InfoBar {
 
  private:
   base::android::ScopedJavaGlobalRef<jobject> java_info_bar_;
-
-  DISALLOW_COPY_AND_ASSIGN(InfoBarAndroid);
 };
 
 }  // namespace infobars
diff --git a/chromium/components/infobars/content/content_infobar_manager.cc b/chromium/components/infobars/content/content_infobar_manager.cc
index 61c43defdd8..0d05e31e8eb 100644
--- a/chromium/components/infobars/content/content_infobar_manager.cc
+++ b/chromium/components/infobars/content/content_infobar_manager.cc
@@ -112,6 +112,6 @@ void ContentInfoBarManager::OpenURL(const GURL& url,
                              ui::PAGE_TRANSITION_LINK, false));
 }
 
-WEB_CONTENTS_USER_DATA_KEY_IMPL(ContentInfoBarManager)
+WEB_CONTENTS_USER_DATA_KEY_IMPL(ContentInfoBarManager);
 
 }  // namespace infobars
diff --git a/chromium/components/infobars/content/content_infobar_manager.h b/chromium/components/infobars/content/content_infobar_manager.h
index fedd7f412d9..7d08bdbc96e 100644
--- a/chromium/components/infobars/content/content_infobar_manager.h
+++ b/chromium/components/infobars/content/content_infobar_manager.h
@@ -30,6 +30,10 @@ class ContentInfoBarManager
       public content::WebContentsUserData<ContentInfoBarManager> {
  public:
   explicit ContentInfoBarManager(content::WebContents* web_contents);
+
+  ContentInfoBarManager(const ContentInfoBarManager&) = delete;
+  ContentInfoBarManager& operator=(const ContentInfoBarManager&) = delete;
+
   ~ContentInfoBarManager() override;
 
   static InfoBarDelegate::NavigationDetails
@@ -70,8 +74,6 @@ class ContentInfoBarManager
 
   // See description in set_ignore_next_reload().
   bool ignore_next_reload_;
-
-  DISALLOW_COPY_AND_ASSIGN(ContentInfoBarManager);
 };
 
 }  // namespace infobars
diff --git a/chromium/components/infobars/core/infobar.h b/chromium/components/infobars/core/infobar.h
index a62c47c61fb..f4d979f51d6 100644
--- a/chromium/components/infobars/core/infobar.h
+++ b/chromium/components/infobars/core/infobar.h
@@ -37,6 +37,10 @@ class InfoBarManager;
 class InfoBar : public gfx::AnimationDelegate {
  public:
   explicit InfoBar(std::unique_ptr<InfoBarDelegate> delegate);
+
+  InfoBar(const InfoBar&) = delete;
+  InfoBar& operator=(const InfoBar&) = delete;
+
   ~InfoBar() override;
 
   InfoBarManager* owner() { return owner_; }
@@ -116,8 +120,6 @@ class InfoBar : public gfx::AnimationDelegate {
   // The current and target heights.
   int height_;  // Includes both fill and bottom separator.
   int target_height_;
-
-  DISALLOW_COPY_AND_ASSIGN(InfoBar);
 };
 
 }  // namespace infobars
diff --git a/chromium/components/infobars/core/infobar_container.h b/chromium/components/infobars/core/infobar_container.h
index d7602d28e03..2e9bbee9c1b 100644
--- a/chromium/components/infobars/core/infobar_container.h
+++ b/chromium/components/infobars/core/infobar_container.h
@@ -38,6 +38,10 @@ class InfoBarContainer : public InfoBarManager::Observer {
   };
 
   explicit InfoBarContainer(Delegate* delegate);
+
+  InfoBarContainer(const InfoBarContainer&) = delete;
+  InfoBarContainer& operator=(const InfoBarContainer&) = delete;
+
   ~InfoBarContainer() override;
 
   // Changes the InfoBarManager for which this container is showing infobars.
@@ -100,8 +104,6 @@ class InfoBarContainer : public InfoBarManager::Observer {
   // functionality in OnInfoBarStateChanged() once, to minimize unnecessary
   // layout and painting.
   bool ignore_infobar_state_changed_;
-
-  DISALLOW_COPY_AND_ASSIGN(InfoBarContainer);
 };
 
 }  // namespace infobars
diff --git a/chromium/components/infobars/core/infobar_delegate.h b/chromium/components/infobars/core/infobar_delegate.h
index 81001cc8467..f2112e5970f 100644
--- a/chromium/components/infobars/core/infobar_delegate.h
+++ b/chromium/components/infobars/core/infobar_delegate.h
@@ -196,6 +196,9 @@ class InfoBarDelegate {
   // Value to use when the InfoBar has no icon to show.
   static const int kNoIconID;
 
+  InfoBarDelegate(const InfoBarDelegate&) = delete;
+  InfoBarDelegate& operator=(const InfoBarDelegate&) = delete;
+
   // Called when the InfoBar that owns this delegate is being destroyed.  At
   // this point nothing is visible onscreen.
   virtual ~InfoBarDelegate();
@@ -291,8 +294,6 @@ class InfoBarDelegate {
 
   // The ID of the active navigation entry at the time we became owned.
   int nav_entry_id_ = 0;
-
-  DISALLOW_COPY_AND_ASSIGN(InfoBarDelegate);
 };
 
 }  // namespace infobars
diff --git a/chromium/components/infobars/core/infobar_manager.h b/chromium/components/infobars/core/infobar_manager.h
index eb53254b6bf..917b18f1769 100644
--- a/chromium/components/infobars/core/infobar_manager.h
+++ b/chromium/components/infobars/core/infobar_manager.h
@@ -38,6 +38,10 @@ class InfoBarManager {
   };
 
   InfoBarManager();
+
+  InfoBarManager(const InfoBarManager&) = delete;
+  InfoBarManager& operator=(const InfoBarManager&) = delete;
+
   virtual ~InfoBarManager();
 
   // Must be called before destruction.
@@ -124,8 +128,6 @@ class InfoBarManager {
   bool animations_enabled_ = true;
 
   base::ObserverList<Observer, true>::Unchecked observer_list_;
-
-  DISALLOW_COPY_AND_ASSIGN(InfoBarManager);
 };
 
 }  // namespace infobars
diff --git a/chromium/components/infobars/core/simple_alert_infobar_delegate.h b/chromium/components/infobars/core/simple_alert_infobar_delegate.h
index 173543c757a..6a4817b0579 100644
--- a/chromium/components/infobars/core/simple_alert_infobar_delegate.h
+++ b/chromium/components/infobars/core/simple_alert_infobar_delegate.h
@@ -23,6 +23,11 @@ class SimpleAlertInfoBarDelegate : public ConfirmInfoBarDelegate {
       const std::u16string& message,
       bool auto_expire,
       bool should_animate);
+
+  SimpleAlertInfoBarDelegate(const SimpleAlertInfoBarDelegate&) = delete;
+  SimpleAlertInfoBarDelegate& operator=(const SimpleAlertInfoBarDelegate&) =
+      delete;
+
   ~SimpleAlertInfoBarDelegate() override;
 
  private:
@@ -39,8 +44,6 @@ class SimpleAlertInfoBarDelegate : public ConfirmInfoBarDelegate {
   std::u16string message_;
   bool auto_expire_;  // Should it expire automatically on navigation?
   bool should_animate_;
-
-  DISALLOW_COPY_AND_ASSIGN(SimpleAlertInfoBarDelegate);
 };
 
 #endif  // COMPONENTS_INFOBARS_CORE_SIMPLE_ALERT_INFOBAR_DELEGATE_H_