Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Unified Diff: chromeos/dbus/services/proxy_resolution_service_provider_unittest.cc

Issue 2775503002: chromeos:: Remove pointless ProxyResolverInterface. (Closed)
Patch Set: fix typo in existing comment Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/dbus/services/proxy_resolution_service_provider_unittest.cc
diff --git a/chromeos/dbus/services/proxy_resolution_service_provider_unittest.cc b/chromeos/dbus/services/proxy_resolution_service_provider_unittest.cc
index 4a70a328453fa87c8ec43f64e35ecab3c8be94a9..0a8882a5c2744b83f4d3ede43224d76992c26497 100644
--- a/chromeos/dbus/services/proxy_resolution_service_provider_unittest.cc
+++ b/chromeos/dbus/services/proxy_resolution_service_provider_unittest.cc
@@ -25,17 +25,17 @@ namespace {
const char kReturnSignalInterface[] = "org.chromium.TestInterface";
const char kReturnSignalName[] = "TestSignal";
-// Test ProxyResolverDelegate implementation.
-class TestProxyResolverDelegate : public ProxyResolverDelegate {
+// Test ProxyResolutionServiceProvider::Delegate implementation.
+class TestDelegate : public ProxyResolutionServiceProvider::Delegate {
public:
- explicit TestProxyResolverDelegate(
+ explicit TestDelegate(
const scoped_refptr<base::SingleThreadTaskRunner>& network_task_runner)
: request_context_getter_(
new net::TestURLRequestContextGetter(network_task_runner)) {
// Use direct connections by default.
proxy_info_.UseDirect();
}
- ~TestProxyResolverDelegate() override {}
+ ~TestDelegate() override = default;
void set_async(bool async) { async_ = async; }
void set_result(net::Error result) { result_ = result; }
@@ -43,7 +43,7 @@ class TestProxyResolverDelegate : public ProxyResolverDelegate {
const net::ProxyInfo& proxy_info() const { return proxy_info_; }
net::ProxyInfo* mutable_proxy_info() { return &proxy_info_; }
- // ProxyResolverDelegate:
+ // ProxyResolutionServiceProvider::Delegate:
scoped_refptr<net::URLRequestContextGetter> GetRequestContext() override {
return request_context_getter_;
}
@@ -75,7 +75,7 @@ class TestProxyResolverDelegate : public ProxyResolverDelegate {
scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
- DISALLOW_COPY_AND_ASSIGN(TestProxyResolverDelegate);
+ DISALLOW_COPY_AND_ASSIGN(TestDelegate);
};
} // namespace
@@ -85,10 +85,9 @@ class ProxyResolutionServiceProviderTest : public testing::Test {
void SetUp() override {
// Create the proxy resolution service with the mock bus and the mock
// resolver injected.
- delegate_ =
- new TestProxyResolverDelegate(base::ThreadTaskRunnerHandle::Get());
- service_provider_.reset(ProxyResolutionServiceProvider::Create(
- std::unique_ptr<TestProxyResolverDelegate>(delegate_)));
+ delegate_ = new TestDelegate(base::ThreadTaskRunnerHandle::Get());
+ service_provider_ = base::MakeUnique<ProxyResolutionServiceProvider>(
+ std::unique_ptr<TestDelegate>(delegate_));
test_helper_.SetUp(kResolveNetworkProxy, service_provider_.get());
@@ -163,8 +162,8 @@ class ProxyResolutionServiceProviderTest : public testing::Test {
std::unique_ptr<SignalInfo> signal_;
ServiceProviderTestHelper test_helper_;
- std::unique_ptr<CrosDBusService::ServiceProviderInterface> service_provider_;
- TestProxyResolverDelegate* delegate_; // Owned by service_provider_.
+ std::unique_ptr<ProxyResolutionServiceProvider> service_provider_;
+ TestDelegate* delegate_; // Owned by |service_provider_|.
};
// Tests that synchronously-resolved proxy information is returned.

Powered by Google App Engine
This is Rietveld 408576698