diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-20 09:47:09 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-07 11:15:42 +0000 |
| commit | 189d4fd8fad9e3c776873be51938cd31a42b6177 (patch) | |
| tree | 6497caeff5e383937996768766ab3bb2081a40b2 /chromium/components/web_cache | |
| parent | 8bc75099d364490b22f43a7ce366b366c08f4164 (diff) | |
| download | qtwebengine-chromium-189d4fd8fad9e3c776873be51938cd31a42b6177.tar.gz | |
BASELINE: Update Chromium to 90.0.4430.221
Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/web_cache')
4 files changed, 9 insertions, 6 deletions
diff --git a/chromium/components/web_cache/DIR_METADATA b/chromium/components/web_cache/DIR_METADATA new file mode 100644 index 00000000000..14b5edb5d61 --- /dev/null +++ b/chromium/components/web_cache/DIR_METADATA @@ -0,0 +1,3 @@ +monorail { + component: "Internals" +} diff --git a/chromium/components/web_cache/OWNERS b/chromium/components/web_cache/OWNERS index e8a333cdf98..3463baf5785 100644 --- a/chromium/components/web_cache/OWNERS +++ b/chromium/components/web_cache/OWNERS @@ -3,4 +3,3 @@ jochen@chromium.org sky@chromium.org thakis@chromium.org thestig@chromium.org -# COMPONENT: Internals diff --git a/chromium/components/web_cache/browser/web_cache_manager.cc b/chromium/components/web_cache/browser/web_cache_manager.cc index 4c5dcdb66a2..ba4577647c2 100644 --- a/chromium/components/web_cache/browser/web_cache_manager.cc +++ b/chromium/components/web_cache/browser/web_cache_manager.cc @@ -157,7 +157,7 @@ void WebCacheManager::ClearCacheOnNavigation() { void WebCacheManager::OnRenderProcessHostCreated( content::RenderProcessHost* process_host) { Add(process_host->GetID()); - rph_observers_.Add(process_host); + rph_observations_.AddObservation(process_host); } void WebCacheManager::RenderProcessExited( @@ -168,7 +168,7 @@ void WebCacheManager::RenderProcessExited( void WebCacheManager::RenderProcessHostDestroyed( content::RenderProcessHost* process_host) { - rph_observers_.Remove(process_host); + rph_observations_.RemoveObservation(process_host); Remove(process_host->GetID()); } diff --git a/chromium/components/web_cache/browser/web_cache_manager.h b/chromium/components/web_cache/browser/web_cache_manager.h index 46f548fae1d..e5e174fc8f2 100644 --- a/chromium/components/web_cache/browser/web_cache_manager.h +++ b/chromium/components/web_cache/browser/web_cache_manager.h @@ -19,7 +19,7 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/no_destructor.h" -#include "base/scoped_observer.h" +#include "base/scoped_multi_source_observation.h" #include "base/time/time.h" #include "components/web_cache/public/mojom/web_cache.mojom.h" #include "content/public/browser/render_process_host.h" @@ -247,8 +247,9 @@ class WebCacheManager : public content::RenderProcessHostCreationObserver, // mojo::Remote<mojom::WebCache>. WebCacheServicesMap web_cache_services_; - ScopedObserver<content::RenderProcessHost, content::RenderProcessHostObserver> - rph_observers_{this}; + base::ScopedMultiSourceObservation<content::RenderProcessHost, + content::RenderProcessHostObserver> + rph_observations_{this}; base::WeakPtrFactory<WebCacheManager> weak_factory_{this}; |