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

Unified Diff: net/proxy/mojo_proxy_resolver_factory_impl.cc

Issue 1126513002: Add ProxyResolverFactoryV8Tracing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-proxy-refactor
Patch Set: Created 5 years, 7 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.cc
diff --git a/net/proxy/mojo_proxy_resolver_factory_impl.cc b/net/proxy/mojo_proxy_resolver_factory_impl.cc
index 9134495ba3f46157ef127657c47730a3a5f7523e..15cdfa7fb11ebd6df361c42808366d9540606469 100644
--- a/net/proxy/mojo_proxy_resolver_factory_impl.cc
+++ b/net/proxy/mojo_proxy_resolver_factory_impl.cc
@@ -10,6 +10,7 @@
#include "net/base/net_errors.h"
#include "net/dns/host_resolver_mojo.h"
#include "net/proxy/mojo_proxy_resolver_impl.h"
+#include "net/proxy/proxy_resolver_error_observer.h"
#include "net/proxy/proxy_resolver_factory.h"
#include "net/proxy/proxy_resolver_v8.h"
#include "net/proxy/proxy_resolver_v8_tracing.h"
@@ -18,30 +19,15 @@
namespace net {
namespace {
-class DefaultProxyResolverFactory : public LegacyProxyResolverFactory {
- public:
- DefaultProxyResolverFactory(
- HostResolver* host_resolver,
- const ProxyResolver::LoadStateChangedCallback& callback)
- : LegacyProxyResolverFactory(true),
- host_resolver_(host_resolver),
- callback_(callback) {}
-
- scoped_ptr<ProxyResolver> CreateProxyResolver() override {
- return make_scoped_ptr(new ProxyResolverV8Tracing(host_resolver_, nullptr,
- nullptr, callback_));
- }
-
- private:
- HostResolver* const host_resolver_;
- const ProxyResolver::LoadStateChangedCallback callback_;
-};
+scoped_ptr<ProxyResolverErrorObserver> ReturnNullErrorObserver() {
+ return nullptr;
+}
scoped_ptr<ProxyResolverFactory> CreateDefaultProxyResolver(
HostResolver* host_resolver,
const ProxyResolver::LoadStateChangedCallback& callback) {
- return make_scoped_ptr(
- new DefaultProxyResolverFactory(host_resolver, callback));
+ return make_scoped_ptr(new ProxyResolverFactoryV8Tracing(
+ host_resolver, nullptr, callback, base::Bind(&ReturnNullErrorObserver)));
}
class LoadStateChangeForwarder
« no previous file with comments | « net/data/proxy_resolver_v8_tracing_unittest/error_on_load.js ('k') | net/proxy/network_delegate_error_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698