Flush Channel IDs when Cookies get saved to a persistent backend

content/browser/net/quota_policy_cookie_store.cc

Index: content/browser/net/quota_policy_cookie_store.cc
diff --git a/content/browser/net/quota_policy_cookie_store.cc b/content/browser/net/quota_policy_cookie_store.cc
index a23125a37a3372ae523844049f52ae4420557d92..22637fe7c4b91f2454a10c151dd6cff5c8d06d8c 100644
--- a/content/browser/net/quota_policy_cookie_store.cc
+++ b/content/browser/net/quota_policy_cookie_store.cc
@@ -110,8 +110,9 @@ void QuotaPolicyCookieStore::OnLoad(
 }
 
 CookieStoreConfig::CookieStoreConfig()
-  : session_cookie_mode(EPHEMERAL_SESSION_COOKIES),
-    crypto_delegate(nullptr) {
+    : session_cookie_mode(EPHEMERAL_SESSION_COOKIES),
+      crypto_delegate(nullptr),
+      channel_id_service(nullptr) {
   // Default to an in-memory cookie store.
 }
 
@@ -124,7 +125,8 @@ CookieStoreConfig::CookieStoreConfig(
       session_cookie_mode(session_cookie_mode),
       storage_policy(storage_policy),
       cookie_delegate(cookie_delegate),
-      crypto_delegate(nullptr) {
+      crypto_delegate(nullptr),
+      channel_id_service(nullptr) {
   CHECK(!path.empty() || session_cookie_mode == EPHEMERAL_SESSION_COOKIES);
 }
 
@@ -174,8 +176,9 @@ std::unique_ptr<net::CookieStore> CreateCookieStore(
             sqlite_store.get(),
             config.storage_policy.get());
 
-    cookie_monster.reset(
-        new net::CookieMonster(persistent_store, config.cookie_delegate.get()));
+    cookie_monster.reset(new net::CookieMonster(persistent_store,
+                                                config.cookie_delegate.get(),
+                                                config.channel_id_service));
     if ((config.session_cookie_mode ==
          CookieStoreConfig::PERSISTANT_SESSION_COOKIES) ||
         (config.session_cookie_mode ==