BASELINE: Update Chromium to 69.0.3497.70

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

2 files changed, 4 insertions, 6 deletions

diff --git a/chromium/components/zoom/zoom_event_manager.cc b/chromium/components/zoom/zoom_event_manager.cc
index a4b086088fc..39a4c63c5e4 100644
--- a/chromium/components/zoom/zoom_event_manager.cc
+++ b/chromium/components/zoom/zoom_event_manager.cc
@@ -45,13 +45,11 @@ void ZoomEventManager::OnDefaultZoomLevelChanged() {
     observer.OnDefaultZoomLevelChanged();
 }
 
-void ZoomEventManager::AddZoomEventManagerObserver(
-    ZoomEventManagerObserver* observer) {
+void ZoomEventManager::AddObserver(ZoomEventManagerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
-void ZoomEventManager::RemoveZoomEventManagerObserver(
-    ZoomEventManagerObserver* observer) {
+void ZoomEventManager::RemoveObserver(ZoomEventManagerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
diff --git a/chromium/components/zoom/zoom_event_manager.h b/chromium/components/zoom/zoom_event_manager.h
index ae2c8f9a013..fc4b865d373 100644
--- a/chromium/components/zoom/zoom_event_manager.h
+++ b/chromium/components/zoom/zoom_event_manager.h
@@ -51,8 +51,8 @@ class ZoomEventManager : public base::SupportsUserData::Data {
   void OnDefaultZoomLevelChanged();
 
   // Add and remove observers.
-  void AddZoomEventManagerObserver(ZoomEventManagerObserver* observer);
-  void RemoveZoomEventManagerObserver(ZoomEventManagerObserver* observer);
+  void AddObserver(ZoomEventManagerObserver* observer);
+  void RemoveObserver(ZoomEventManagerObserver* observer);
 
   // Get a weak ptr to be used by clients who may themselves be UserData for
   // the context, since the order of destruction is undefined between the client