| 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 89af70d138b6c8711ebd25fed1378dea927a4378..59b5b78221cf7b410323a2c1806992516d12b260 100644
|
| --- a/net/proxy/mojo_proxy_resolver_factory_impl.cc
|
| +++ b/net/proxy/mojo_proxy_resolver_factory_impl.cc
|
| @@ -94,15 +94,15 @@ MojoProxyResolverFactoryImpl::~MojoProxyResolverFactoryImpl() {
|
| }
|
|
|
| void MojoProxyResolverFactoryImpl::CreateResolver(
|
| - const mojo::String& pac_script,
|
| + const std::string& pac_script,
|
| mojo::InterfaceRequest<interfaces::ProxyResolver> request,
|
| interfaces::ProxyResolverFactoryRequestClientPtr client) {
|
| // The Job will call RemoveJob on |this| when either the create request
|
| // finishes or |request| or |client| encounters a connection error.
|
| - std::unique_ptr<Job> job = base::MakeUnique<Job>(
|
| - this, ProxyResolverScriptData::FromUTF8(pac_script.To<std::string>()),
|
| - proxy_resolver_impl_factory_.get(), std::move(request),
|
| - std::move(client));
|
| + std::unique_ptr<Job> job =
|
| + base::MakeUnique<Job>(this, ProxyResolverScriptData::FromUTF8(pac_script),
|
| + proxy_resolver_impl_factory_.get(),
|
| + std::move(request), std::move(client));
|
| Job* job_ptr = job.get();
|
| jobs_[job_ptr] = std::move(job);
|
| }
|
|
|