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 <map> | 5 #include <map> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
11 #include "base/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
12 #include "net/proxy/proxy_config.h" | 12 #include "net/proxy/proxy_config.h" |
13 #include "net/proxy/proxy_config_service_android.h" | 13 #include "net/proxy/proxy_config_service_android.h" |
14 #include "net/proxy/proxy_info.h" | 14 #include "net/proxy/proxy_info.h" |
15 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
16 | 16 |
17 namespace net { | 17 namespace net { |
18 | 18 |
19 namespace { | 19 namespace { |
20 | 20 |
21 class TestObserver : public ProxyConfigService::Observer { | 21 class TestObserver : public ProxyConfigService::Observer { |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
343 TEST_F(ProxyConfigServiceAndroidTest, HttpProxySupercedesSocks) { | 343 TEST_F(ProxyConfigServiceAndroidTest, HttpProxySupercedesSocks) { |
344 // SOCKS proxy is ignored if default HTTP proxy defined. | 344 // SOCKS proxy is ignored if default HTTP proxy defined. |
345 AddProperty("proxyHost", "defaultproxy.com"); | 345 AddProperty("proxyHost", "defaultproxy.com"); |
346 AddProperty("socksProxyHost", "socksproxy.com"); | 346 AddProperty("socksProxyHost", "socksproxy.com"); |
347 AddProperty("socksProxyPort", "9000"); | 347 AddProperty("socksProxyPort", "9000"); |
348 ProxySettingsChanged(); | 348 ProxySettingsChanged(); |
349 TestMapping("http://example.com/", "PROXY defaultproxy.com:80"); | 349 TestMapping("http://example.com/", "PROXY defaultproxy.com:80"); |
350 } | 350 } |
351 | 351 |
352 } // namespace net | 352 } // namespace net |
OLD | NEW |