| 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/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 loop_.RunUntilIdle(); | 98 loop_.RunUntilIdle(); |
| 99 } | 99 } |
| 100 | 100 |
| 101 virtual void TearDown() { | 101 virtual void TearDown() { |
| 102 proxy_config_tracker_->DetachFromPrefService(); | 102 proxy_config_tracker_->DetachFromPrefService(); |
| 103 loop_.RunUntilIdle(); | 103 loop_.RunUntilIdle(); |
| 104 proxy_config_tracker_.reset(); | 104 proxy_config_tracker_.reset(); |
| 105 proxy_config_service_.reset(); | 105 proxy_config_service_.reset(); |
| 106 } | 106 } |
| 107 | 107 |
| 108 MessageLoop loop_; | 108 base::MessageLoop loop_; |
| 109 TestProxyConfigService* delegate_service_; // weak | 109 TestProxyConfigService* delegate_service_; // weak |
| 110 scoped_ptr<ChromeProxyConfigService> proxy_config_service_; | 110 scoped_ptr<ChromeProxyConfigService> proxy_config_service_; |
| 111 net::ProxyConfig fixed_config_; | 111 net::ProxyConfig fixed_config_; |
| 112 | 112 |
| 113 private: | 113 private: |
| 114 scoped_ptr<PrefProxyConfigTrackerImpl> proxy_config_tracker_; | 114 scoped_ptr<PrefProxyConfigTrackerImpl> proxy_config_tracker_; |
| 115 content::TestBrowserThread ui_thread_; | 115 content::TestBrowserThread ui_thread_; |
| 116 content::TestBrowserThread io_thread_; | 116 content::TestBrowserThread io_thread_; |
| 117 }; | 117 }; |
| 118 | 118 |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 477 net::ProxyRulesExpectation::Empty(), | 477 net::ProxyRulesExpectation::Empty(), |
| 478 }, | 478 }, |
| 479 }; | 479 }; |
| 480 | 480 |
| 481 INSTANTIATE_TEST_CASE_P( | 481 INSTANTIATE_TEST_CASE_P( |
| 482 PrefProxyConfigTrackerImplCommandLineTestInstance, | 482 PrefProxyConfigTrackerImplCommandLineTestInstance, |
| 483 PrefProxyConfigTrackerImplCommandLineTest, | 483 PrefProxyConfigTrackerImplCommandLineTest, |
| 484 testing::ValuesIn(kCommandLineTestParams)); | 484 testing::ValuesIn(kCommandLineTestParams)); |
| 485 | 485 |
| 486 } // namespace | 486 } // namespace |
| OLD | NEW |