Flush Channel IDs when Cookies get saved to a persistent backend

chrome/browser/safe_browsing/safe_browsing_service.cc

Index: chrome/browser/safe_browsing/safe_browsing_service.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index 07a9efe51a52c539795cb2e9d8aaec3d98472ab7..4434639263a541917ec39e415db6d3c05213bb15 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -184,15 +184,6 @@ SafeBrowsingURLRequestContextGetter::GetURLRequestContext() {
       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(
@@ -201,6 +192,16 @@ SafeBrowsingURLRequestContextGetter::GetURLRequestContext() {
                 {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(