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

Side by Side Diff: net/proxy/proxy_resolver_factory_mojo.cc

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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 unified diff | Download patch
OLDNEW
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/stl_util.h" 11 #include "base/stl_util.h"
12 #include "base/threading/thread_checker.h" 12 #include "base/threading/thread_checker.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "mojo/common/common_type_converters.h" 14 #include "mojo/common/common_type_converters.h"
15 #include "mojo/common/url_type_converters.h" 15 #include "mojo/common/url_type_converters.h"
16 #include "mojo/public/cpp/bindings/binding.h"
16 #include "net/base/load_states.h" 17 #include "net/base/load_states.h"
17 #include "net/base/net_errors.h" 18 #include "net/base/net_errors.h"
18 #include "net/dns/mojo_host_resolver_impl.h" 19 #include "net/dns/mojo_host_resolver_impl.h"
19 #include "net/interfaces/host_resolver_service.mojom.h" 20 #include "net/interfaces/host_resolver_service.mojom.h"
20 #include "net/interfaces/proxy_resolver_service.mojom.h" 21 #include "net/interfaces/proxy_resolver_service.mojom.h"
21 #include "net/proxy/mojo_proxy_resolver_factory.h" 22 #include "net/proxy/mojo_proxy_resolver_factory.h"
22 #include "net/proxy/mojo_proxy_type_converters.h" 23 #include "net/proxy/mojo_proxy_type_converters.h"
23 #include "net/proxy/proxy_info.h" 24 #include "net/proxy/proxy_info.h"
24 #include "net/proxy/proxy_resolver.h" 25 #include "net/proxy/proxy_resolver.h"
25 #include "net/proxy/proxy_resolver_error_observer.h" 26 #include "net/proxy/proxy_resolver_error_observer.h"
26 #include "net/proxy/proxy_resolver_script_data.h" 27 #include "net/proxy/proxy_resolver_script_data.h"
27 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
28 28
29 namespace net { 29 namespace net {
30 namespace { 30 namespace {
31 31
32 scoped_ptr<base::Value> NetLogErrorCallback( 32 scoped_ptr<base::Value> NetLogErrorCallback(
33 int line_number, 33 int line_number,
34 const base::string16* message, 34 const base::string16* message,
35 NetLogCaptureMode /* capture_mode */) { 35 NetLogCaptureMode /* capture_mode */) {
36 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); 36 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
37 dict->SetInteger("line_number", line_number); 37 dict->SetInteger("line_number", line_number);
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 return ERR_PAC_SCRIPT_FAILED; 404 return ERR_PAC_SCRIPT_FAILED;
405 } 405 }
406 request->reset(new Job(this, pac_script, resolver, callback, 406 request->reset(new Job(this, pac_script, resolver, callback,
407 error_observer_factory_.is_null() 407 error_observer_factory_.is_null()
408 ? nullptr 408 ? nullptr
409 : error_observer_factory_.Run())); 409 : error_observer_factory_.Run()));
410 return ERR_IO_PENDING; 410 return ERR_IO_PENDING;
411 } 411 }
412 412
413 } // namespace net 413 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_resolver_factory_mojo.h ('k') | net/proxy/proxy_resolver_factory_mojo_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698