OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/pref_proxy_config_tracker_impl.h" | 5 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "chrome/browser/net/chrome_url_request_context.h" | 10 #include "chrome/browser/net/chrome_url_request_context.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 | 37 |
38 void SetProxyConfig(const net::ProxyConfig config, | 38 void SetProxyConfig(const net::ProxyConfig config, |
39 ConfigAvailability availability) { | 39 ConfigAvailability availability) { |
40 config_ = config; | 40 config_ = config; |
41 availability_ = availability; | 41 availability_ = availability; |
42 FOR_EACH_OBSERVER(net::ProxyConfigService::Observer, observers_, | 42 FOR_EACH_OBSERVER(net::ProxyConfigService::Observer, observers_, |
43 OnProxyConfigChanged(config, availability)); | 43 OnProxyConfigChanged(config, availability)); |
44 } | 44 } |
45 | 45 |
46 private: | 46 private: |
47 virtual void AddObserver(net::ProxyConfigService::Observer* observer) { | 47 virtual void AddObserver( |
| 48 net::ProxyConfigService::Observer* observer) OVERRIDE { |
48 observers_.AddObserver(observer); | 49 observers_.AddObserver(observer); |
49 } | 50 } |
50 | 51 |
51 virtual void RemoveObserver(net::ProxyConfigService::Observer* observer) { | 52 virtual void RemoveObserver( |
| 53 net::ProxyConfigService::Observer* observer) OVERRIDE { |
52 observers_.RemoveObserver(observer); | 54 observers_.RemoveObserver(observer); |
53 } | 55 } |
54 | 56 |
55 virtual net::ProxyConfigService::ConfigAvailability GetLatestProxyConfig( | 57 virtual net::ProxyConfigService::ConfigAvailability GetLatestProxyConfig( |
56 net::ProxyConfig* config) { | 58 net::ProxyConfig* config) OVERRIDE { |
57 *config = config_; | 59 *config = config_; |
58 return availability_; | 60 return availability_; |
59 } | 61 } |
60 | 62 |
61 net::ProxyConfig config_; | 63 net::ProxyConfig config_; |
62 ConfigAvailability availability_; | 64 ConfigAvailability availability_; |
63 ObserverList<net::ProxyConfigService::Observer, true> observers_; | 65 ObserverList<net::ProxyConfigService::Observer, true> observers_; |
64 }; | 66 }; |
65 | 67 |
66 // A mock observer for capturing callbacks. | 68 // A mock observer for capturing callbacks. |
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
475 net::ProxyRulesExpectation::Empty(), | 477 net::ProxyRulesExpectation::Empty(), |
476 }, | 478 }, |
477 }; | 479 }; |
478 | 480 |
479 INSTANTIATE_TEST_CASE_P( | 481 INSTANTIATE_TEST_CASE_P( |
480 PrefProxyConfigTrackerImplCommandLineTestInstance, | 482 PrefProxyConfigTrackerImplCommandLineTestInstance, |
481 PrefProxyConfigTrackerImplCommandLineTest, | 483 PrefProxyConfigTrackerImplCommandLineTest, |
482 testing::ValuesIn(kCommandLineTestParams)); | 484 testing::ValuesIn(kCommandLineTestParams)); |
483 | 485 |
484 } // namespace | 486 } // namespace |
OLD | NEW |