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

Unified Diff: net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc

Issue 1017453005: Add support for ProxyResolverErrorObserver to ProxyResolverMojo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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: net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc
diff --git a/net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc b/net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc
index eff4a6342bb2f34c825685eed6b1078c99d71060..4b434bbfb15c14916ba5471bd82d4e3c2bcd2590 100644
--- a/net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc
+++ b/net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc
@@ -5,6 +5,7 @@
#include "net/proxy/mojo_proxy_resolver_factory_impl.h"
#include "net/proxy/mock_proxy_resolver.h"
+#include "net/proxy/proxy_resolver_error_observer.h"
#include "net/test/event_waiter.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
@@ -47,8 +48,10 @@ class MojoProxyResolverFactoryImplTest : public testing::Test,
scoped_ptr<ProxyResolver> CreateFakeProxyResolver(
HostResolver* host_resolver,
+ scoped_ptr<ProxyResolverErrorObserver> error_observer,
const ProxyResolver::LoadStateChangedCallback& callback) {
EXPECT_TRUE(host_resolver);
+ EXPECT_TRUE(error_observer);
instances_created_++;
waiter_.NotifyEvent(RESOLVER_CREATED);
return make_scoped_ptr(new FakeProxyResolver(base::Bind(
@@ -74,8 +77,10 @@ TEST_F(MojoProxyResolverFactoryImplTest, DisconnectHostResolver) {
interfaces::HostResolverPtr host_resolver;
mojo::InterfaceRequest<interfaces::HostResolver> host_resolver_request =
mojo::GetProxy(&host_resolver);
+ interfaces::ProxyResolverErrorObserverPtr error_observer;
+ mojo::GetProxy(&error_observer);
factory_->CreateResolver(mojo::GetProxy(&proxy_resolver),
- host_resolver.Pass());
+ host_resolver.Pass(), error_observer.Pass());
proxy_resolver.set_error_handler(this);
waiter_.WaitForEvent(RESOLVER_CREATED);
EXPECT_EQ(1, instances_created_);
@@ -93,8 +98,10 @@ TEST_F(MojoProxyResolverFactoryImplTest, DisconnectProxyResolverClient) {
mojo::GetProxy(&host_resolver);
mojo::Binding<interfaces::HostResolver> binding(nullptr, &host_resolver);
binding.set_error_handler(this);
+ interfaces::ProxyResolverErrorObserverPtr error_observer;
+ mojo::GetProxy(&error_observer);
factory_->CreateResolver(mojo::GetProxy(&proxy_resolver),
- host_resolver.Pass());
+ host_resolver.Pass(), error_observer.Pass());
waiter_.WaitForEvent(RESOLVER_CREATED);
EXPECT_EQ(1, instances_created_);
EXPECT_EQ(0, instances_destroyed_);
@@ -109,8 +116,10 @@ TEST_F(MojoProxyResolverFactoryImplTest, DisconnectBoth) {
interfaces::HostResolverPtr host_resolver;
mojo::InterfaceRequest<interfaces::HostResolver> host_resolver_request =
mojo::GetProxy(&host_resolver);
+ interfaces::ProxyResolverErrorObserverPtr error_observer;
+ mojo::GetProxy(&error_observer);
factory_->CreateResolver(mojo::GetProxy(&proxy_resolver),
- host_resolver.Pass());
+ host_resolver.Pass(), error_observer.Pass());
waiter_.WaitForEvent(RESOLVER_CREATED);
EXPECT_EQ(1, instances_created_);
EXPECT_EQ(0, instances_destroyed_);

Powered by Google App Engine
This is Rietveld 408576698