| 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 "chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h" | 5 #include "chrome/browser/net/utility_process_mojo_proxy_resolver_factory.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 | 42 |
| 43 void UtilityProcessMojoProxyResolverFactory::CreateProcessAndConnect() { | 43 void UtilityProcessMojoProxyResolverFactory::CreateProcessAndConnect() { |
| 44 DCHECK(thread_checker_.CalledOnValidThread()); | 44 DCHECK(thread_checker_.CalledOnValidThread()); |
| 45 DVLOG(1) << "Attempting to create utility process for proxy resolver"; | 45 DVLOG(1) << "Attempting to create utility process for proxy resolver"; |
| 46 content::UtilityProcessHost* utility_process_host = | 46 content::UtilityProcessHost* utility_process_host = |
| 47 content::UtilityProcessHost::Create( | 47 content::UtilityProcessHost::Create( |
| 48 scoped_refptr<content::UtilityProcessHostClient>(), | 48 scoped_refptr<content::UtilityProcessHostClient>(), |
| 49 base::ThreadTaskRunnerHandle::Get()); | 49 base::ThreadTaskRunnerHandle::Get()); |
| 50 utility_process_host->SetName(l10n_util::GetStringUTF16( | 50 utility_process_host->SetName(l10n_util::GetStringUTF16( |
| 51 IDS_UTILITY_PROCESS_PROXY_RESOLVER_NAME)); | 51 IDS_UTILITY_PROCESS_PROXY_RESOLVER_NAME)); |
| 52 bool process_started = utility_process_host->StartMojoMode(); | 52 bool process_started = utility_process_host->Start(); |
| 53 if (process_started) { | 53 if (process_started) { |
| 54 content::ServiceRegistry* service_registry = | 54 content::ServiceRegistry* service_registry = |
| 55 utility_process_host->GetServiceRegistry(); | 55 utility_process_host->GetServiceRegistry(); |
| 56 service_registry->ConnectToRemoteService( | 56 service_registry->ConnectToRemoteService( |
| 57 mojo::GetProxy(&resolver_factory_)); | 57 mojo::GetProxy(&resolver_factory_)); |
| 58 resolver_factory_.set_connection_error_handler( | 58 resolver_factory_.set_connection_error_handler( |
| 59 base::Bind(&UtilityProcessMojoProxyResolverFactory::OnConnectionError, | 59 base::Bind(&UtilityProcessMojoProxyResolverFactory::OnConnectionError, |
| 60 base::Unretained(this))); | 60 base::Unretained(this))); |
| 61 weak_utility_process_host_ = utility_process_host->AsWeakPtr(); | 61 weak_utility_process_host_ = utility_process_host->AsWeakPtr(); |
| 62 } else { | 62 } else { |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 } | 110 } |
| 111 } | 111 } |
| 112 | 112 |
| 113 void UtilityProcessMojoProxyResolverFactory::OnIdleTimeout() { | 113 void UtilityProcessMojoProxyResolverFactory::OnIdleTimeout() { |
| 114 DCHECK(thread_checker_.CalledOnValidThread()); | 114 DCHECK(thread_checker_.CalledOnValidThread()); |
| 115 DCHECK_EQ(num_proxy_resolvers_, 0u); | 115 DCHECK_EQ(num_proxy_resolvers_, 0u); |
| 116 delete weak_utility_process_host_.get(); | 116 delete weak_utility_process_host_.get(); |
| 117 weak_utility_process_host_.reset(); | 117 weak_utility_process_host_.reset(); |
| 118 resolver_factory_.reset(); | 118 resolver_factory_.reset(); |
| 119 } | 119 } |
| OLD | NEW |