Flush Channel IDs when Cookies get saved to a persistent backend

chrome/browser/safe_browsing/safe_browsing_service.cc

 // Copyright (c) 2012 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 "chrome/browser/safe_browsing/safe_browsing_service.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 166 matching lines @@
   if (shut_down_)
     return nullptr;
 
   if (!safe_browsing_request_context_) {
     safe_browsing_request_context_.reset(new net::URLRequestContext());
     // May be NULL in unit tests.
     if (system_context_getter_) {
       safe_browsing_request_context_->CopyFrom(
           system_context_getter_->GetURLRequestContext());
     }
-    safe_browsing_cookie_store_ =
-        content::CreateCookieStore(content::CookieStoreConfig(
-            CookieFilePath(),
-            content::CookieStoreConfig::EPHEMERAL_SESSION_COOKIES, nullptr,
-            nullptr));
-
-    safe_browsing_request_context_->set_cookie_store(
-        safe_browsing_cookie_store_.get());
-
     // Set up the ChannelIDService
     scoped_refptr<net::SQLiteChannelIDStore> channel_id_db =
         new net::SQLiteChannelIDStore(
             ChannelIDFilePath(),
             base::CreateSequencedTaskRunnerWithTraits(
                 {base::MayBlock(), base::TaskPriority::BACKGROUND}));
     channel_id_service_.reset(new net::ChannelIDService(
         new net::DefaultChannelIDStore(channel_id_db.get())));
+
+    // Set up the CookieStore
+    content::CookieStoreConfig cookie_config(
+        CookieFilePath(), content::CookieStoreConfig::EPHEMERAL_SESSION_COOKIES,
+        nullptr, nullptr);
+    cookie_config.channel_id_service = channel_id_service_.get();
+    safe_browsing_cookie_store_ = content::CreateCookieStore(cookie_config);
+    safe_browsing_request_context_->set_cookie_store(
+        safe_browsing_cookie_store_.get());
+
     safe_browsing_request_context_->set_channel_id_service(
         channel_id_service_.get());
     safe_browsing_cookie_store_->SetChannelIDServiceID(
         channel_id_service_->GetUniqueID());
 
     // Rebuild the HttpNetworkSession and the HttpTransactionFactory to use the
     // new ChannelIDService.
     if (safe_browsing_request_context_->http_transaction_factory() &&
         safe_browsing_request_context_->http_transaction_factory()
             ->GetSession()) {
@@ skipping 569 matching lines @@
   auto it = password_protection_service_map_.find(profile);
   if (it != password_protection_service_map_.end())
     password_protection_service_map_.erase(it);
 }
 
 void SafeBrowsingService::CreateTriggerManager() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   trigger_manager_ = base::MakeUnique<TriggerManager>(ui_manager_.get());
 }
 }  // namespace safe_browsing