| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chromeos/network/client_cert_resolver.h" | 5 #include "chromeos/network/client_cert_resolver.h" |
| 6 | 6 |
| 7 #include <cert.h> | 7 #include <cert.h> |
| 8 #include <certt.h> // for (SECCertUsageEnum) certUsageAnyCA | 8 #include <certt.h> // for (SECCertUsageEnum) certUsageAnyCA |
| 9 #include <pk11pub.h> | 9 #include <pk11pub.h> |
| 10 | 10 |
| (...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 NetworkTypePattern::Default(), | 380 NetworkTypePattern::Default(), |
| 381 true /* configured_only */, | 381 true /* configured_only */, |
| 382 false /* visible_only */, | 382 false /* visible_only */, |
| 383 0 /* no limit */, | 383 0 /* no limit */, |
| 384 &networks); | 384 &networks); |
| 385 | 385 |
| 386 NetworkStateHandler::NetworkStateList networks_to_check; | 386 NetworkStateHandler::NetworkStateList networks_to_check; |
| 387 for (NetworkStateHandler::NetworkStateList::const_iterator it = | 387 for (NetworkStateHandler::NetworkStateList::const_iterator it = |
| 388 networks.begin(); it != networks.end(); ++it) { | 388 networks.begin(); it != networks.end(); ++it) { |
| 389 const std::string& service_path = (*it)->path(); | 389 const std::string& service_path = (*it)->path(); |
| 390 if (ContainsKey(old_resolved_networks, service_path)) { | 390 if (base::ContainsKey(old_resolved_networks, service_path)) { |
| 391 resolved_networks_.insert(service_path); | 391 resolved_networks_.insert(service_path); |
| 392 continue; | 392 continue; |
| 393 } | 393 } |
| 394 networks_to_check.push_back(*it); | 394 networks_to_check.push_back(*it); |
| 395 } | 395 } |
| 396 | 396 |
| 397 ResolveNetworks(networks_to_check); | 397 ResolveNetworks(networks_to_check); |
| 398 } | 398 } |
| 399 | 399 |
| 400 void ClientCertResolver::NetworkConnectionStateChanged( | 400 void ClientCertResolver::NetworkConnectionStateChanged( |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 572 FOR_EACH_OBSERVER(Observer, observers_, ResolveRequestCompleted(changed)); | 572 FOR_EACH_OBSERVER(Observer, observers_, ResolveRequestCompleted(changed)); |
| 573 } | 573 } |
| 574 | 574 |
| 575 base::Time ClientCertResolver::Now() const { | 575 base::Time ClientCertResolver::Now() const { |
| 576 if (testing_clock_) | 576 if (testing_clock_) |
| 577 return testing_clock_->Now(); | 577 return testing_clock_->Now(); |
| 578 return base::Time::Now(); | 578 return base::Time::Now(); |
| 579 } | 579 } |
| 580 | 580 |
| 581 } // namespace chromeos | 581 } // namespace chromeos |
| OLD | NEW |