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 1532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1543 EXPECT_EQ(ProxyConfigService::CONFIG_VALID, | 1543 EXPECT_EQ(ProxyConfigService::CONFIG_VALID, |
1544 sync_config_getter.SyncGetLatestProxyConfig(&config)); | 1544 sync_config_getter.SyncGetLatestProxyConfig(&config)); |
1545 EXPECT_TRUE(config.auto_detect()); | 1545 EXPECT_TRUE(config.auto_detect()); |
1546 EXPECT_EQ(GURL(), config.pac_url()); | 1546 EXPECT_EQ(GURL(), config.pac_url()); |
1547 } | 1547 } |
1548 | 1548 |
1549 // Now create .kde4 and put a kioslaverc in the config directory. | 1549 // Now create .kde4 and put a kioslaverc in the config directory. |
1550 // Note that its timestamp will be at least as new as the .kde one. | 1550 // Note that its timestamp will be at least as new as the .kde one. |
1551 file_util::CreateDirectory(kde4_config_); | 1551 file_util::CreateDirectory(kde4_config_); |
1552 file_util::WriteFile(kioslaverc4_, slaverc4.c_str(), slaverc4.length()); | 1552 file_util::WriteFile(kioslaverc4_, slaverc4.c_str(), slaverc4.length()); |
1553 CHECK(file_util::PathExists(kioslaverc4_)); | 1553 CHECK(base::PathExists(kioslaverc4_)); |
1554 | 1554 |
1555 { SCOPED_TRACE("KDE4, .kde4 directory present, use it"); | 1555 { SCOPED_TRACE("KDE4, .kde4 directory present, use it"); |
1556 MockEnvironment* env = new MockEnvironment; | 1556 MockEnvironment* env = new MockEnvironment; |
1557 env->values.DESKTOP_SESSION = "kde4"; | 1557 env->values.DESKTOP_SESSION = "kde4"; |
1558 env->values.HOME = user_home_.value().c_str(); | 1558 env->values.HOME = user_home_.value().c_str(); |
1559 SynchConfigGetter sync_config_getter( | 1559 SynchConfigGetter sync_config_getter( |
1560 new ProxyConfigServiceLinux(env)); | 1560 new ProxyConfigServiceLinux(env)); |
1561 ProxyConfig config; | 1561 ProxyConfig config; |
1562 sync_config_getter.SetupAndInitialFetch(); | 1562 sync_config_getter.SetupAndInitialFetch(); |
1563 EXPECT_EQ(ProxyConfigService::CONFIG_VALID, | 1563 EXPECT_EQ(ProxyConfigService::CONFIG_VALID, |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1608 ProxyConfig config; | 1608 ProxyConfig config; |
1609 sync_config_getter.SetupAndInitialFetch(); | 1609 sync_config_getter.SetupAndInitialFetch(); |
1610 EXPECT_EQ(ProxyConfigService::CONFIG_VALID, | 1610 EXPECT_EQ(ProxyConfigService::CONFIG_VALID, |
1611 sync_config_getter.SyncGetLatestProxyConfig(&config)); | 1611 sync_config_getter.SyncGetLatestProxyConfig(&config)); |
1612 EXPECT_TRUE(config.auto_detect()); | 1612 EXPECT_TRUE(config.auto_detect()); |
1613 EXPECT_EQ(GURL(), config.pac_url()); | 1613 EXPECT_EQ(GURL(), config.pac_url()); |
1614 } | 1614 } |
1615 } | 1615 } |
1616 | 1616 |
1617 } // namespace net | 1617 } // namespace net |
OLD | NEW |