| OLD | NEW | 
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "net/proxy/proxy_resolver_factory_mojo.h" | 5 #include "net/proxy/proxy_resolver_factory_mojo.h" | 
| 6 | 6 | 
| 7 #include <set> | 7 #include <set> | 
| 8 | 8 | 
| 9 #include "base/bind.h" | 9 #include "base/bind.h" | 
| 10 #include "base/logging.h" | 10 #include "base/logging.h" | 
|  | 11 #include "base/macros.h" | 
| 11 #include "base/stl_util.h" | 12 #include "base/stl_util.h" | 
| 12 #include "base/threading/thread_checker.h" | 13 #include "base/threading/thread_checker.h" | 
| 13 #include "base/values.h" | 14 #include "base/values.h" | 
| 14 #include "mojo/common/common_type_converters.h" | 15 #include "mojo/common/common_type_converters.h" | 
| 15 #include "mojo/common/url_type_converters.h" | 16 #include "mojo/common/url_type_converters.h" | 
| 16 #include "mojo/public/cpp/bindings/binding.h" | 17 #include "mojo/public/cpp/bindings/binding.h" | 
| 17 #include "net/base/load_states.h" | 18 #include "net/base/load_states.h" | 
| 18 #include "net/base/net_errors.h" | 19 #include "net/base/net_errors.h" | 
| 19 #include "net/dns/mojo_host_resolver_impl.h" | 20 #include "net/dns/mojo_host_resolver_impl.h" | 
| 20 #include "net/interfaces/host_resolver_service.mojom.h" | 21 #include "net/interfaces/host_resolver_service.mojom.h" | 
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 403     return ERR_PAC_SCRIPT_FAILED; | 404     return ERR_PAC_SCRIPT_FAILED; | 
| 404   } | 405   } | 
| 405   request->reset(new Job(this, pac_script, resolver, callback, | 406   request->reset(new Job(this, pac_script, resolver, callback, | 
| 406                          error_observer_factory_.is_null() | 407                          error_observer_factory_.is_null() | 
| 407                              ? nullptr | 408                              ? nullptr | 
| 408                              : error_observer_factory_.Run())); | 409                              : error_observer_factory_.Run())); | 
| 409   return ERR_IO_PENDING; | 410   return ERR_IO_PENDING; | 
| 410 } | 411 } | 
| 411 | 412 | 
| 412 }  // namespace net | 413 }  // namespace net | 
| OLD | NEW | 
|---|