[Android] flush local storage without callback for m138. (#7669)

aee-google · briantting · web-flow · commit 1b12e4d9942f · 2025-10-22T10:09:20.000-07:00
LocalStorageControl.Flush() was changed to not include a callback.

Issue: 371433332

Co-authored-by: Brian Ting &lt;brianting@google.com&gt;
diff --git a/cobalt/browser/cobalt_content_browser_client.cc b/cobalt/browser/cobalt_content_browser_client.cc
@@ -46,7 +46,6 @@
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/pref_service_factory.h"
-#include "components/services/storage/public/mojom/local_storage_control.mojom.h"
 #include "components/variations/pref_names.h"
 #include "components/variations/service/variations_service.h"
 #include "content/public/browser/browser_thread.h"
@@ -379,12 +378,11 @@ void CobaltContentBrowserClient::FlushCookiesAndLocalStorage(
   CHECK(rfh);
   auto* storage_partition = rfh->GetStoragePartition();
   CHECK(storage_partition);
+  // Flushes localStorage.
+  storage_partition->Flush();
   auto* cookie_manager = storage_partition->GetCookieManagerForBrowserProcess();
   CHECK(cookie_manager);
-  auto flush_cookies =
-      base::BindOnce(&network::mojom::CookieManager::FlushCookieStore,
-                     base::Unretained(cookie_manager), std::move(callback));
-  storage_partition->GetLocalStorageControl()->Flush(std::move(flush_cookies));
+  cookie_manager->FlushCookieStore(std::move(callback));
 }
 
 void CobaltContentBrowserClient::SetUpCobaltFeaturesAndParams(
diff --git a/cobalt/browser/h5vcc_system/h5vcc_system_impl.cc b/cobalt/browser/h5vcc_system/h5vcc_system_impl.cc
@@ -18,7 +18,6 @@
 #include "base/functional/callback.h"
 #include "base/notreached.h"
 #include "build/build_config.h"
-#include "components/services/storage/public/mojom/local_storage_control.mojom.h"
 #include "content/public/browser/storage_partition.h"
 #include "services/network/public/mojom/cookie_manager.mojom.h"
 
@@ -209,14 +208,13 @@ void H5vccSystemImpl::Exit() {
   // and in platform-specific lifecycle handlers.
   auto* storage_partition = render_frame_host().GetStoragePartition();
   CHECK(storage_partition);
+  // Flushes localStorage.
+  storage_partition->Flush();
   auto* cookie_manager = storage_partition->GetCookieManagerForBrowserProcess();
   CHECK(cookie_manager);
-  auto flush_cookies = base::BindOnce(
-      &network::mojom::CookieManager::FlushCookieStore,
-      base::Unretained(cookie_manager), base::BindOnce(&PerformExitStrategy));
   // Sequencing exit strategy after flushing delays performing exit strategy by
   // 20ms when tested on a chromecast.
-  storage_partition->GetLocalStorageControl()->Flush(std::move(flush_cookies));
+  cookie_manager->FlushCookieStore(base::BindOnce(&PerformExitStrategy));
 }
 
 }  // namespace h5vcc_system
