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

Unified Diff: net/proxy/proxy_service_mojo_unittest.cc

Issue 2625853002: Remove --v8-pac-mojo-in-process (Closed)
Patch Set: test Created 3 years, 11 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
« no previous file with comments | « net/proxy/proxy_service_mojo.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_service_mojo_unittest.cc
diff --git a/net/proxy/proxy_service_mojo_unittest.cc b/net/proxy/proxy_service_mojo_unittest.cc
index ec8c999f0f0046173ec7fa0e473de14e337057a2..d2b3526f540727ce45812ef5462aef0f3dd39eba 100644
--- a/net/proxy/proxy_service_mojo_unittest.cc
+++ b/net/proxy/proxy_service_mojo_unittest.cc
@@ -11,8 +11,10 @@
#include "base/callback_helpers.h"
#include "base/memory/ptr_util.h"
+#include "base/memory/singleton.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
#include "net/base/network_delegate_impl.h"
#include "net/base/test_completion_callback.h"
#include "net/dns/mock_host_resolver.h"
@@ -21,9 +23,9 @@
#include "net/log/test_net_log.h"
#include "net/log/test_net_log_entry.h"
#include "net/proxy/dhcp_proxy_script_fetcher.h"
-#include "net/proxy/in_process_mojo_proxy_resolver_factory.h"
#include "net/proxy/mock_proxy_script_fetcher.h"
#include "net/proxy/mojo_proxy_resolver_factory.h"
+#include "net/proxy/mojo_proxy_resolver_factory_impl.h"
#include "net/proxy/proxy_config_service_fixed.h"
#include "net/proxy/proxy_service.h"
#include "net/test/event_waiter.h"
@@ -122,6 +124,34 @@ class LoggingMockHostResolver : public MockHostResolver {
}
};
+class InProcessMojoProxyResolverFactory : public MojoProxyResolverFactory {
+ public:
+ static InProcessMojoProxyResolverFactory* GetInstance() {
+ return base::Singleton<InProcessMojoProxyResolverFactory>::get();
+ }
+
+ // Overridden from MojoProxyResolverFactory:
+ std::unique_ptr<base::ScopedClosureRunner> CreateResolver(
+ const std::string& pac_script,
+ mojo::InterfaceRequest<interfaces::ProxyResolver> req,
+ interfaces::ProxyResolverFactoryRequestClientPtr client) override {
+ factory_->CreateResolver(pac_script, std::move(req), std::move(client));
+ return nullptr;
+ }
+
+ private:
+ InProcessMojoProxyResolverFactory() {
+ mojo::MakeStrongBinding(base::MakeUnique<MojoProxyResolverFactoryImpl>(),
+ mojo::MakeRequest(&factory_));
+ }
+ ~InProcessMojoProxyResolverFactory() override = default;
+ friend struct base::DefaultSingletonTraits<InProcessMojoProxyResolverFactory>;
+
+ interfaces::ProxyResolverFactoryPtr factory_;
+
+ DISALLOW_COPY_AND_ASSIGN(InProcessMojoProxyResolverFactory);
+};
+
} // namespace
class ProxyServiceMojoTest : public testing::Test,
« no previous file with comments | « net/proxy/proxy_service_mojo.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698