Servicify http auth cache removal in ChromeBrowsingDataRemoverDelegate.

Bug: 824967
Change-Id: I4eb57d85bb057061bf12848f39127a6542ebe886
Reviewed-on: https://chromium-review.googlesource.com/1037523
Commit-Queue: Eric Orth <ericorth@chromium.org>
Reviewed-by: Martin Šrámek <msramek@chromium.org>
Reviewed-by: Helen Li <xunjieli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555881}

chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc

@@ -88,6 +88,7 @@
 #include "content/public/browser/ssl_host_state_delegate.h"
 #include "content/public/browser/storage_partition.h"
 #include "media/mojo/services/video_decode_perf_history.h"
+#include "mojo/public/cpp/bindings/callback_helpers.h"
 #include "net/cookies/cookie_store.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/net_buildflags.h"
@@ -249,20 +250,6 @@ void ClearHostnameResolutionCacheOnIOThread(
   io_thread->ClearHostCache(host_filter);
 }
 
-void ClearHttpAuthCacheOnIOThread(
-    scoped_refptr<net::URLRequestContextGetter> context_getter,
-    base::Time delete_begin) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
-  net::HttpNetworkSession* http_session = context_getter->GetURLRequestContext()
-                                              ->http_transaction_factory()
-                                              ->GetSession();
-  DCHECK(http_session);
-  http_session->http_auth_cache()->ClearEntriesAddedWithin(base::Time::Now() -
-                                                           delete_begin);
-  http_session->CloseAllConnections();
-}
-
 #if BUILDFLAG(ENABLE_REPORTING)
 void ClearReportingCacheOnIOThread(
     net::URLRequestContextGetter* context,
@@ -848,14 +835,10 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
               CreatePendingTaskCompletionClosure()));
     }
 
-    scoped_refptr<net::URLRequestContextGetter> request_context =
-        BrowserContext::GetDefaultStoragePartition(profile_)
-            ->GetURLRequestContext();
-    BrowserThread::PostTaskAndReply(
-        BrowserThread::IO, FROM_HERE,
-        base::BindOnce(&ClearHttpAuthCacheOnIOThread,
-                       std::move(request_context), delete_begin_),
-        CreatePendingTaskCompletionClosure());
+    BrowserContext::GetDefaultStoragePartition(profile_)
+        ->GetNetworkContext()
+        ->ClearHttpAuthCache(delete_begin_,
+                             CreatePendingTaskCompletionClosureForMojo());
   }
 
   if (remove_mask & content::BrowsingDataRemover::DATA_TYPE_COOKIES) {
@@ -1191,6 +1174,17 @@ ChromeBrowsingDataRemoverDelegate::CreatePendingTaskCompletionClosure() {
                         weak_ptr_factory_.GetWeakPtr());
 }
 
+base::OnceClosure
+ChromeBrowsingDataRemoverDelegate::CreatePendingTaskCompletionClosureForMojo() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  // Note num_pending_tasks++ unnecessary here because it's done by the call to
+  // CreatePendingTaskCompletionClosure().
+  return mojo::WrapCallbackWithDropHandler(
+      CreatePendingTaskCompletionClosure(),
+      base::BindOnce(&ChromeBrowsingDataRemoverDelegate::OnTaskComplete,
+                     weak_ptr_factory_.GetWeakPtr()));
+}
+
 #if defined(OS_ANDROID)
 void ChromeBrowsingDataRemoverDelegate::OverrideWebappRegistryForTesting(
     std::unique_ptr<WebappRegistry> webapp_registry) {

chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h

@@ -187,6 +187,11 @@ class ChromeBrowsingDataRemoverDelegate
   // created by this method have been invoked.
   base::OnceClosure CreatePendingTaskCompletionClosure();
 
+  // Same as CreatePendingTaskCompletionClosure() but guarantees that
+  // OnTaskComplete() is called if the task is dropped. That can typically
+  // happen when the connection is closed while an interface call is made.
+  base::OnceClosure CreatePendingTaskCompletionClosureForMojo();
+
   // Callback for when TemplateURLService has finished loading. Clears the data,
   // clears the respective waiting flag, and invokes NotifyIfDone.
   void OnKeywordsLoaded(base::RepeatingCallback<bool(const GURL&)> url_filter,