| 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 "net/proxy/proxy_config_service_linux.h" | 5 #include "net/proxy/proxy_config_service_linux.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 | 184 |
| 185 virtual bool SetUpNotifications(ProxyConfigServiceLinux::Delegate* delegate) | 185 virtual bool SetUpNotifications(ProxyConfigServiceLinux::Delegate* delegate) |
| 186 OVERRIDE { | 186 OVERRIDE { |
| 187 return true; | 187 return true; |
| 188 } | 188 } |
| 189 | 189 |
| 190 virtual base::SingleThreadTaskRunner* GetNotificationTaskRunner() OVERRIDE { | 190 virtual base::SingleThreadTaskRunner* GetNotificationTaskRunner() OVERRIDE { |
| 191 return NULL; | 191 return NULL; |
| 192 } | 192 } |
| 193 | 193 |
| 194 virtual const char* GetDataSource() OVERRIDE { | 194 virtual ProxyConfigSource GetConfigSource() OVERRIDE { |
| 195 return "test"; | 195 return PROXY_CONFIG_SOURCE_TEST; |
| 196 } | 196 } |
| 197 | 197 |
| 198 virtual bool GetString(StringSetting key, std::string* result) OVERRIDE { | 198 virtual bool GetString(StringSetting key, std::string* result) OVERRIDE { |
| 199 const char* value = strings_table.Get(key); | 199 const char* value = strings_table.Get(key); |
| 200 if (value) { | 200 if (value) { |
| 201 *result = value; | 201 *result = value; |
| 202 return true; | 202 return true; |
| 203 } | 203 } |
| 204 return false; | 204 return false; |
| 205 } | 205 } |
| (...skipping 1386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1592 ProxyConfig config; | 1592 ProxyConfig config; |
| 1593 sync_config_getter.SetupAndInitialFetch(); | 1593 sync_config_getter.SetupAndInitialFetch(); |
| 1594 EXPECT_EQ(ProxyConfigService::CONFIG_VALID, | 1594 EXPECT_EQ(ProxyConfigService::CONFIG_VALID, |
| 1595 sync_config_getter.SyncGetLatestProxyConfig(&config)); | 1595 sync_config_getter.SyncGetLatestProxyConfig(&config)); |
| 1596 EXPECT_TRUE(config.auto_detect()); | 1596 EXPECT_TRUE(config.auto_detect()); |
| 1597 EXPECT_EQ(GURL(), config.pac_url()); | 1597 EXPECT_EQ(GURL(), config.pac_url()); |
| 1598 } | 1598 } |
| 1599 } | 1599 } |
| 1600 | 1600 |
| 1601 } // namespace net | 1601 } // namespace net |
| OLD | NEW |