BASELINE: Update Chromium to 96.0.4664.181

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

4 files changed, 13 insertions, 11 deletions

diff --git a/chromium/components/web_cache/browser/web_cache_manager.cc b/chromium/components/web_cache/browser/web_cache_manager.cc
index 593ef17152d..a0afa4004bf 100644
--- a/chromium/components/web_cache/browser/web_cache_manager.cc
+++ b/chromium/components/web_cache/browser/web_cache_manager.cc
@@ -21,7 +21,6 @@
 #include "components/web_cache/public/features.h"
 
 using base::Time;
-using base::TimeDelta;
 
 namespace web_cache {
 
@@ -389,7 +388,7 @@ void WebCacheManager::ReviseAllocationStrategyLater() {
       FROM_HERE,
       base::BindOnce(&WebCacheManager::ReviseAllocationStrategy,
                      weak_factory_.GetWeakPtr()),
-      base::TimeDelta::FromMilliseconds(kReviseAllocationDelayMS));
+      base::Milliseconds(kReviseAllocationDelayMS));
 }
 
 void WebCacheManager::FindInactiveRenderers() {
@@ -397,8 +396,8 @@ void WebCacheManager::FindInactiveRenderers() {
   while (iter != active_renderers_.end()) {
     auto elmt = stats_.find(*iter);
     DCHECK(elmt != stats_.end());
-    TimeDelta idle = Time::Now() - elmt->second.access;
-    if (idle >= TimeDelta::FromMinutes(kRendererInactiveThresholdMinutes)) {
+    base::TimeDelta idle = Time::Now() - elmt->second.access;
+    if (idle >= base::Minutes(kRendererInactiveThresholdMinutes)) {
       // Moved to inactive status.  This invalidates our iterator.
       inactive_renderers_.insert(*iter);
       active_renderers_.erase(*iter);
diff --git a/chromium/components/web_cache/browser/web_cache_manager.h b/chromium/components/web_cache/browser/web_cache_manager.h
index e5e174fc8f2..514a72c72b7 100644
--- a/chromium/components/web_cache/browser/web_cache_manager.h
+++ b/chromium/components/web_cache/browser/web_cache_manager.h
@@ -62,6 +62,9 @@ class WebCacheManager : public content::RenderProcessHostCreationObserver,
   // Subsequent calls will return the same object.
   static WebCacheManager* GetInstance();
 
+  WebCacheManager(const WebCacheManager&) = delete;
+  WebCacheManager& operator=(const WebCacheManager&) = delete;
+
   // When a render process is created, it registers itself with the cache
   // manager host, causing the renderer to be allocated cache resources.
   void Add(int renderer_id);
@@ -252,8 +255,6 @@ class WebCacheManager : public content::RenderProcessHostCreationObserver,
       rph_observations_{this};
 
   base::WeakPtrFactory<WebCacheManager> weak_factory_{this};
-
-  DISALLOW_COPY_AND_ASSIGN(WebCacheManager);
 };
 
 }  // namespace web_cache
diff --git a/chromium/components/web_cache/browser/web_cache_manager_unittest.cc b/chromium/components/web_cache/browser/web_cache_manager_unittest.cc
index 52be1ded363..3cf08f75902 100644
--- a/chromium/components/web_cache/browser/web_cache_manager_unittest.cc
+++ b/chromium/components/web_cache/browser/web_cache_manager_unittest.cc
@@ -11,7 +11,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
-using base::TimeDelta;
 namespace web_cache {
 
 class WebCacheManagerTest : public testing::Test {
@@ -34,8 +33,9 @@ class WebCacheManagerTest : public testing::Test {
   }
 
   static void SimulateInactivity(WebCacheManager* h, int renderer_id) {
-    stats(h)[renderer_id].access = Time::Now() - TimeDelta::FromMinutes(
-        WebCacheManager::kRendererInactiveThresholdMinutes);
+    stats(h)[renderer_id].access =
+        Time::Now() -
+        base::Minutes(WebCacheManager::kRendererInactiveThresholdMinutes);
     h->FindInactiveRenderers();
   }
 
diff --git a/chromium/components/web_cache/renderer/web_cache_impl.h b/chromium/components/web_cache/renderer/web_cache_impl.h
index b8d544565c3..03ba70e79ab 100644
--- a/chromium/components/web_cache/renderer/web_cache_impl.h
+++ b/chromium/components/web_cache/renderer/web_cache_impl.h
@@ -22,6 +22,10 @@ namespace web_cache {
 class WebCacheImpl : public mojom::WebCache {
  public:
   WebCacheImpl();
+
+  WebCacheImpl(const WebCacheImpl&) = delete;
+  WebCacheImpl& operator=(const WebCacheImpl&) = delete;
+
   ~WebCacheImpl() override;
 
   void BindReceiver(mojo::PendingReceiver<mojom::WebCache> web_cache_receiver);
@@ -51,8 +55,6 @@ class WebCacheImpl : public mojom::WebCache {
   mojo::ReceiverSet<mojom::WebCache> receivers_;
 
   absl::optional<base::MemoryPressureListener> memory_pressure_listener_;
-
-  DISALLOW_COPY_AND_ASSIGN(WebCacheImpl);
 };
 
 }  // namespace web_cache