8e82a32d4c
This is needed to fix the cert verifier tests that were temporarily disabled in r532778. Also remove the public headers in services/network/public/cpp that are implemented in services/network. As Ken pointed out, public/cpp is just client library and isn't a public interface. Bug: 753658 Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo Change-Id: Ie4f721a781cb8c1c345749ea9e1f30cbf67e5fd7 Reviewed-on: https://chromium-review.googlesource.com/894298 Reviewed-by: Ken Rockot <rockot@chromium.org> Commit-Queue: John Abd-El-Malek <jam@chromium.org> Cr-Commit-Position: refs/heads/master@{#533385}
85 lines
3.0 KiB
C++
85 lines
3.0 KiB
C++
// Copyright 2017 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/public/browser/network_service_instance.h"
|
|
|
|
#include "base/feature_list.h"
|
|
#include "content/browser/network_service_client.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "content/public/browser/content_browser_client.h"
|
|
#include "content/public/common/service_manager_connection.h"
|
|
#include "content/public/common/service_names.mojom.h"
|
|
#include "services/network/network_service.h"
|
|
#include "services/network/public/cpp/features.h"
|
|
#include "services/service_manager/public/cpp/connector.h"
|
|
|
|
namespace content {
|
|
|
|
namespace {
|
|
|
|
network::mojom::NetworkServicePtr* g_network_service_ptr = nullptr;
|
|
network::NetworkService* g_network_service;
|
|
|
|
void CreateNetworkServiceOnIO(network::mojom::NetworkServiceRequest request) {
|
|
if (g_network_service) {
|
|
// GetNetworkServiceImpl() was already called and created the object, so
|
|
// just bind it.
|
|
g_network_service->Bind(std::move(request));
|
|
return;
|
|
}
|
|
|
|
g_network_service = new network::NetworkService(
|
|
nullptr, std::move(request), GetContentClient()->browser()->GetNetLog());
|
|
}
|
|
|
|
} // namespace
|
|
|
|
network::mojom::NetworkService* GetNetworkService() {
|
|
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
|
|
|
if (!g_network_service_ptr)
|
|
g_network_service_ptr = new network::mojom::NetworkServicePtr;
|
|
static NetworkServiceClient* g_client;
|
|
if (!g_network_service_ptr->is_bound() ||
|
|
g_network_service_ptr->encountered_error()) {
|
|
if (base::FeatureList::IsEnabled(network::features::kNetworkService)) {
|
|
ServiceManagerConnection::GetForProcess()->GetConnector()->BindInterface(
|
|
mojom::kNetworkServiceName, g_network_service_ptr);
|
|
} else {
|
|
DCHECK(!g_network_service_ptr->is_bound());
|
|
BrowserThread::PostTask(
|
|
BrowserThread::IO, FROM_HERE,
|
|
base::BindOnce(CreateNetworkServiceOnIO,
|
|
mojo::MakeRequest(g_network_service_ptr)));
|
|
}
|
|
|
|
network::mojom::NetworkServiceClientPtr client_ptr;
|
|
delete g_client; // In case we're recreating the network service.
|
|
g_client = new NetworkServiceClient(mojo::MakeRequest(&client_ptr));
|
|
(*g_network_service_ptr)->SetClient(std::move(client_ptr));
|
|
}
|
|
return g_network_service_ptr->get();
|
|
}
|
|
|
|
network::NetworkService* GetNetworkServiceImpl() {
|
|
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
|
DCHECK(!base::FeatureList::IsEnabled(network::features::kNetworkService));
|
|
if (!g_network_service) {
|
|
g_network_service = new network::NetworkService(
|
|
nullptr, nullptr, GetContentClient()->browser()->GetNetLog());
|
|
}
|
|
|
|
return g_network_service;
|
|
}
|
|
|
|
void FlushNetworkServiceInstanceForTesting() {
|
|
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
|
DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService));
|
|
|
|
if (g_network_service_ptr)
|
|
g_network_service_ptr->FlushForTesting();
|
|
}
|
|
|
|
} // namespace content
|