Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed Windows only DNS over HTTP work-around #15140

Merged
merged 1 commit into from
Sep 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions browser/brave_vpn/brave_vpn_service_factory.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@
#include "content/public/browser/browser_context.h"
#include "content/public/browser/storage_partition.h"

#if BUILDFLAG(IS_WIN)
#include "brave/browser/brave_vpn/dns/brave_vpn_dns_observer_factory.h"
#include "brave/browser/brave_vpn/dns/brave_vpn_dns_observer_service.h"
#endif

namespace brave_vpn {

// static
Expand Down Expand Up @@ -55,9 +50,6 @@ BraveVpnServiceFactory::BraveVpnServiceFactory()
"BraveVpnService",
BrowserContextDependencyManager::GetInstance()) {
DependsOn(skus::SkusServiceFactory::GetInstance());
#if BUILDFLAG(IS_WIN)
DependsOn(brave_vpn::BraveVpnDnsObserverFactory::GetInstance());
#endif
}

BraveVpnServiceFactory::~BraveVpnServiceFactory() = default;
Expand All @@ -78,16 +70,8 @@ KeyedService* BraveVpnServiceFactory::BuildServiceInstanceFor(
return skus::SkusServiceFactory::GetForContext(context);
},
context);
auto* vpn_service =
new BraveVpnService(shared_url_loader_factory, local_state, callback);
#if BUILDFLAG(IS_WIN)
auto* dns_observer_service =
brave_vpn::BraveVpnDnsObserverFactory::GetInstance()
->GetServiceForContext(context);
if (dns_observer_service)
dns_observer_service->Observe(vpn_service);
#endif
return vpn_service;

return new BraveVpnService(shared_url_loader_factory, local_state, callback);
}

void BraveVpnServiceFactory::RegisterProfilePrefs(
Expand Down
66 changes: 0 additions & 66 deletions browser/brave_vpn/dns/brave_vpn_dns_observer_factory.cc

This file was deleted.

43 changes: 0 additions & 43 deletions browser/brave_vpn/dns/brave_vpn_dns_observer_factory.h

This file was deleted.

175 changes: 0 additions & 175 deletions browser/brave_vpn/dns/brave_vpn_dns_observer_service.cc

This file was deleted.

Loading