| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chromeos/proxy_config_service_impl.h" | 5 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 net::ProxyConfigService::ConfigAvailability SyncGetLatestProxyConfig( | 316 net::ProxyConfigService::ConfigAvailability SyncGetLatestProxyConfig( |
| 317 net::ProxyConfig* config) { | 317 net::ProxyConfig* config) { |
| 318 *config = net::ProxyConfig(); | 318 *config = net::ProxyConfig(); |
| 319 // Let message loop process all messages. | 319 // Let message loop process all messages. |
| 320 loop_.RunUntilIdle(); | 320 loop_.RunUntilIdle(); |
| 321 // Calls ChromeProIOGetProxyConfig (which is called from | 321 // Calls ChromeProIOGetProxyConfig (which is called from |
| 322 // ProxyConfigService::GetLatestProxyConfig), running on faked IO thread. | 322 // ProxyConfigService::GetLatestProxyConfig), running on faked IO thread. |
| 323 return proxy_config_service_->GetLatestProxyConfig(config); | 323 return proxy_config_service_->GetLatestProxyConfig(config); |
| 324 } | 324 } |
| 325 | 325 |
| 326 MessageLoop loop_; | 326 base::MessageLoop loop_; |
| 327 scoped_ptr<ChromeProxyConfigService> proxy_config_service_; | 327 scoped_ptr<ChromeProxyConfigService> proxy_config_service_; |
| 328 scoped_ptr<ProxyConfigServiceImpl> config_service_impl_; | 328 scoped_ptr<ProxyConfigServiceImpl> config_service_impl_; |
| 329 | 329 |
| 330 private: | 330 private: |
| 331 // Default stub state has ethernet as the active connected network and | 331 // Default stub state has ethernet as the active connected network and |
| 332 // PROFILE_SHARED as profile type, which this unittest expects. | 332 // PROFILE_SHARED as profile type, which this unittest expects. |
| 333 ScopedStubCrosEnabler stub_cros_enabler_; | 333 ScopedStubCrosEnabler stub_cros_enabler_; |
| 334 ScopedTestDeviceSettingsService test_device_settings_service_; | 334 ScopedTestDeviceSettingsService test_device_settings_service_; |
| 335 ScopedTestCrosSettings test_cros_settings_; | 335 ScopedTestCrosSettings test_cros_settings_; |
| 336 content::TestBrowserThread ui_thread_; | 336 content::TestBrowserThread ui_thread_; |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 556 EXPECT_EQ(network_params.auto_detect, actual_config.auto_detect()); | 556 EXPECT_EQ(network_params.auto_detect, actual_config.auto_detect()); |
| 557 EXPECT_EQ(network_params.pac_url, actual_config.pac_url()); | 557 EXPECT_EQ(network_params.pac_url, actual_config.pac_url()); |
| 558 EXPECT_TRUE(network_params.proxy_rules.Matches( | 558 EXPECT_TRUE(network_params.proxy_rules.Matches( |
| 559 actual_config.proxy_rules())); | 559 actual_config.proxy_rules())); |
| 560 } | 560 } |
| 561 } | 561 } |
| 562 | 562 |
| 563 } // namespace | 563 } // namespace |
| 564 | 564 |
| 565 } // namespace chromeos | 565 } // namespace chromeos |
| OLD | NEW |