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 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
364 kioslaverc_ = path.Append(FILE_PATH_LITERAL("kioslaverc")); | 364 kioslaverc_ = path.Append(FILE_PATH_LITERAL("kioslaverc")); |
365 // Set up paths but do not create the directory for .kde4. | 365 // Set up paths but do not create the directory for .kde4. |
366 kde4_home_ = user_home_.Append(FILE_PATH_LITERAL(".kde4")); | 366 kde4_home_ = user_home_.Append(FILE_PATH_LITERAL(".kde4")); |
367 path = kde4_home_.Append(FILE_PATH_LITERAL("share")); | 367 path = kde4_home_.Append(FILE_PATH_LITERAL("share")); |
368 kde4_config_ = path.Append(FILE_PATH_LITERAL("config")); | 368 kde4_config_ = path.Append(FILE_PATH_LITERAL("config")); |
369 kioslaverc4_ = kde4_config_.Append(FILE_PATH_LITERAL("kioslaverc")); | 369 kioslaverc4_ = kde4_config_.Append(FILE_PATH_LITERAL("kioslaverc")); |
370 } | 370 } |
371 | 371 |
372 virtual void TearDown() OVERRIDE { | 372 virtual void TearDown() OVERRIDE { |
373 // Delete the temporary KDE home directory. | 373 // Delete the temporary KDE home directory. |
374 base::Delete(user_home_, true); | 374 base::DeleteFile(user_home_, true); |
375 PlatformTest::TearDown(); | 375 PlatformTest::TearDown(); |
376 } | 376 } |
377 | 377 |
378 base::FilePath user_home_; | 378 base::FilePath user_home_; |
379 // KDE3 paths. | 379 // KDE3 paths. |
380 base::FilePath kde_home_; | 380 base::FilePath kde_home_; |
381 base::FilePath kioslaverc_; | 381 base::FilePath kioslaverc_; |
382 // KDE4 paths. | 382 // KDE4 paths. |
383 base::FilePath kde4_home_; | 383 base::FilePath kde4_home_; |
384 base::FilePath kde4_config_; | 384 base::FilePath kde4_config_; |
(...skipping 1223 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 |