Flush Channel IDs when Cookies get saved to a persistent backend

content/browser/net/quota_policy_cookie_store.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/net/quota_policy_cookie_store.h"
 
 #include <list>
 #include <memory>
 
 #include "base/bind.h"
@@ skipping 92 matching lines @@
   for (const auto& cookie : cookies) {
     net::SQLitePersistentCookieStore::CookieOrigin origin(
         cookie->Domain(), cookie->IsSecure());
     ++cookies_per_origin_[origin];
   }
 
   loaded_callback.Run(std::move(cookies));
 }
 
 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.
 }
 
 CookieStoreConfig::CookieStoreConfig(
     const base::FilePath& path,
     SessionCookieMode session_cookie_mode,
     storage::SpecialStoragePolicy* storage_policy,
     net::CookieMonsterDelegate* cookie_delegate)
     : path(path),
       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);
 }
 
 CookieStoreConfig::~CookieStoreConfig() {
 }
 
 std::unique_ptr<net::CookieStore> CreateCookieStore(
     const CookieStoreConfig& config) {
   // TODO(bcwhite): Remove ScopedTracker below once crbug.com/483686 is fixed.
   tracked_objects::ScopedTracker tracking_profile(
@@ skipping 29 matching lines @@
             background_task_runner,
             (config.session_cookie_mode ==
              CookieStoreConfig::RESTORED_SESSION_COOKIES),
             config.crypto_delegate));
 
     QuotaPolicyCookieStore* persistent_store =
         new QuotaPolicyCookieStore(
             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 ==
          CookieStoreConfig::RESTORED_SESSION_COOKIES)) {
       cookie_monster->SetPersistSessionCookies(true);
     }
   }
 
   if (!config.cookieable_schemes.empty())
     cookie_monster->SetCookieableSchemes(config.cookieable_schemes);
 
   return std::move(cookie_monster);
 }
 
 }  // namespace content