[266]Make NetworkContext resettable

Expose StoragePartitionImpl::InitNetworkContext() and add
StoragePartition::NetworkContextCreatedObserver.

The public StoragePartitionImpl::ResetNetworkContext() method allows
recreating the NetworkContext used inside a storage partition so as to
change network settings dynamically. The old network context is
destroyed before creating the replacement.

The observer notifies when NetworkContext is created and makes it
possible to check if StoragePartitionImpl::ResetNetworkContext()
is done with its asynchronous tasks.

===============================================================

We posted the OnNetworkContextCreated call right after the
construction of NetworkContext, however its client() is not
guaranteed to exist at this point. Magically it worked for a long
time, because typically the next call after construction is
SetClient(), which (most of the time) can run before the posted
lambda.

The following change [1] introduced a new mojo call between the
constructor and SetClient, which defers SetClient and so we miss
the opportunity to notify client() in the lambda.

Moving OnNetworkContextCreated() to SetClient() seems to be a good
solution, because setting the client typically means that we
finished the construction of a NetworkContext.

This brings back clearHttpCacheCompleted signal to life and fixes
tst_QWebEngineProfile::clearDataFromCache().

[1] https://chromium-review.googlesource.com/c/chromium/src/+/5440136

Task-number: QTBUG-81558
Task-number: QTBUG-89670
Task-number: QTBUG-111541
Change-Id: I5f4ea50650b35e1f35ad67a009964e76038ea750
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/493884
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

Author: stampho

chromium/content/browser/preloading/prefetch/prefetch_network_context_client.cc

@@ -57,4 +57,6 @@ void PrefetchNetworkContextClient::OnCanSendSCTAuditingReport(
 void PrefetchNetworkContextClient::OnNewSCTAuditingReportSent() {}
 #endif
 
+void PrefetchNetworkContextClient::OnNetworkContextCreated() {}
+
 }  // namespace content

chromium/content/browser/preloading/prefetch/prefetch_network_context_client.h

@@ -46,6 +46,7 @@ class PrefetchNetworkContextClient
       OnCanSendSCTAuditingReportCallback callback) override;
   void OnNewSCTAuditingReportSent() override;
 #endif
+  void OnNetworkContextCreated() override;
 };
 
 }  // namespace content

chromium/content/browser/storage_partition_impl.cc

@@ -3223,6 +3223,14 @@ void StoragePartitionImpl::RemoveObserver(DataRemovalObserver* observer) {
   data_removal_observers_.RemoveObserver(observer);
 }
 
+void StoragePartitionImpl::SetNetworkContextCreatedObserver(NetworkContextCreatedObserver *observer) {
+  network_context_created_observer_ = observer;
+}
+
+StoragePartition::NetworkContextCreatedObserver *StoragePartitionImpl::GetNetworkContextCreatedObserver() {
+  return network_context_created_observer_;
+}
+
 void StoragePartitionImpl::FlushNetworkInterfaceForTesting() {
   CHECK(initialized_);
   DCHECK(network_context_owner_->network_context);
@@ -3515,7 +3523,11 @@ void StoragePartitionImpl::InitNetworkContext() {
         cookie_deprecation_label_manager_->GetValue().value_or("");
   }
 
-  network_context_owner_->network_context.reset();
+  if (network_context_owner_->network_context.is_bound()) {
+    network_context_owner_->network_context.set_disconnect_handler(base::OnceClosure());
+    network_context_owner_->network_context.reset();
+    network_context_client_receiver_.reset();
+  }
   CreateNetworkContextInNetworkService(
       network_context_owner_->network_context.BindNewPipeAndPassReceiver(),
       std::move(context_params));
@@ -3530,13 +3542,19 @@ void StoragePartitionImpl::InitNetworkContext() {
   network_context_owner_->network_context->RevokeNetworkForNonces(
       nonces, base::NullCallback());
 
-  network_context_client_receiver_.reset();
   network_context_owner_->network_context->SetClient(
       network_context_client_receiver_.BindNewPipeAndPassRemote());
   network_context_owner_->network_context.set_disconnect_handler(base::BindOnce(
       &StoragePartitionImpl::InitNetworkContext, weak_factory_.GetWeakPtr()));
 }
 
+void StoragePartitionImpl::OnNetworkContextCreated() {
+#if BUILDFLAG(IS_QTWEBENGINE)
+  if (network_context_created_observer_)
+    network_context_created_observer_->OnNetworkContextCreated(this);
+#endif
+}
+
 network::mojom::URLLoaderFactoryParamsPtr
 StoragePartitionImpl::CreateURLLoaderFactoryParams() {
   network::mojom::URLLoaderFactoryParamsPtr params =

chromium/content/browser/storage_partition_impl.h

@@ -266,6 +266,8 @@ class CONTENT_EXPORT StoragePartitionImpl
   void ClearBluetoothAllowedDevicesMapForTesting() override;
   void AddObserver(DataRemovalObserver* observer) override;
   void RemoveObserver(DataRemovalObserver* observer) override;
+  void SetNetworkContextCreatedObserver(NetworkContextCreatedObserver *observer) override;
+  NetworkContextCreatedObserver *GetNetworkContextCreatedObserver() override;
   void FlushNetworkInterfaceForTesting() override;
   void FlushCertVerifierInterfaceForTesting() override;
   void WaitForDeletionTasksForTesting() override;
@@ -344,6 +346,7 @@ class CONTENT_EXPORT StoragePartitionImpl
       OnCanSendSCTAuditingReportCallback callback) override;
   void OnNewSCTAuditingReportSent() override;
 #endif
+  void OnNetworkContextCreated() override;
 
   // network::mojom::URLLoaderNetworkServiceObserver interface.
   void OnSSLCertificateError(const GURL& url,
@@ -483,6 +486,9 @@ class CONTENT_EXPORT StoragePartitionImpl
 
   std::vector<std::string> GetCorsExemptHeaderList();
 
+#if BUILDFLAG(IS_QTWEBENGINE)
+  void ResetNetworkContext() { InitNetworkContext(); }
+#endif
   void OpenLocalStorageForProcess(
       int process_id,
       const blink::StorageKey& storage_key,
@@ -930,6 +936,8 @@ class CONTENT_EXPORT StoragePartitionImpl
   bool on_browser_context_will_be_destroyed_called_ = false;
 #endif
 
+  NetworkContextCreatedObserver *network_context_created_observer_ = nullptr;
+
   // A copy of the network revocation nonces in `NetworkContext`. It is used for
   // restoring the network revocation states of fenced frames when there is a
   // `NetworkService` crash.

chromium/content/public/browser/storage_partition.h

@@ -290,6 +290,11 @@ class CONTENT_EXPORT StoragePartition {
         const base::Time end) = 0;
   };
 
+  class NetworkContextCreatedObserver {
+   public:
+    virtual void OnNetworkContextCreated(StoragePartition *storage) = 0;
+  };
+
   // Similar to ClearDataForOrigin().
   // Deletes all data out for the StoragePartition if |storage_key|'s origin is
   // opaque. |callback| is called when data deletion is done or at least the
@@ -355,6 +360,9 @@ class CONTENT_EXPORT StoragePartition {
 
   virtual void RemoveObserver(DataRemovalObserver* observer) = 0;
 
+  virtual void SetNetworkContextCreatedObserver(NetworkContextCreatedObserver *observer) = 0;
+  virtual NetworkContextCreatedObserver *GetNetworkContextCreatedObserver() = 0;
+
   // Clear the bluetooth allowed devices map. For test use only.
   virtual void ClearBluetoothAllowedDevicesMapForTesting() = 0;
 

chromium/services/network/network_context.cc

@@ -996,6 +996,15 @@ void NetworkContext::SetClient(
     mojo::PendingRemote<mojom::NetworkContextClient> client) {
   client_.reset();
   client_.Bind(std::move(client));
+
+#if BUILDFLAG(IS_QTWEBENGINE)
+base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+    FROM_HERE, base::BindOnce([](NetworkContext *context) {
+      if (context->client()) {
+          context->client()->OnNetworkContextCreated();
+      }
+    }, this));
+#endif
 }
 
 void NetworkContext::CreateURLLoaderFactory(

chromium/services/network/public/mojom/network_context_client.mojom

@@ -59,4 +59,7 @@ interface NetworkContextClient {
   // clients.
   [EnableIf=is_ct_supported]
   OnNewSCTAuditingReportSent();
+
+  // Called when NetworkContext is created in the network service.
+  OnNetworkContextCreated();
 };