Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(233)

Side by Side Diff: net/proxy/proxy_config_service_linux_unittest.cc

Issue 19052005: Move PathIsWritable, DirectoryExists, ContentsEqual, and TextContentsEqual to the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/proxy/proxy_config_service_linux.cc ('k') | net/test/python_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1512 matching lines...) Expand 10 before | Expand all | Expand 10 after
1523 // Valid PAC URL. 1523 // Valid PAC URL.
1524 std::string slaverc4 = "[Proxy Settings]\nProxyType=2\n" 1524 std::string slaverc4 = "[Proxy Settings]\nProxyType=2\n"
1525 "Proxy Config Script=http://wpad/wpad.dat\n"; 1525 "Proxy Config Script=http://wpad/wpad.dat\n";
1526 GURL slaverc4_pac_url("http://wpad/wpad.dat"); 1526 GURL slaverc4_pac_url("http://wpad/wpad.dat");
1527 1527
1528 // Overwrite the .kde kioslaverc file. 1528 // Overwrite the .kde kioslaverc file.
1529 file_util::WriteFile(kioslaverc_, slaverc3.c_str(), slaverc3.length()); 1529 file_util::WriteFile(kioslaverc_, slaverc3.c_str(), slaverc3.length());
1530 1530
1531 // If .kde4 exists it will mess up the first test. It should not, as 1531 // If .kde4 exists it will mess up the first test. It should not, as
1532 // we created the directory for $HOME in the test setup. 1532 // we created the directory for $HOME in the test setup.
1533 CHECK(!file_util::DirectoryExists(kde4_home_)); 1533 CHECK(!base::DirectoryExists(kde4_home_));
1534 1534
1535 { SCOPED_TRACE("KDE4, no .kde4 directory, verify fallback"); 1535 { SCOPED_TRACE("KDE4, no .kde4 directory, verify fallback");
1536 MockEnvironment* env = new MockEnvironment; 1536 MockEnvironment* env = new MockEnvironment;
1537 env->values.DESKTOP_SESSION = "kde4"; 1537 env->values.DESKTOP_SESSION = "kde4";
1538 env->values.HOME = user_home_.value().c_str(); 1538 env->values.HOME = user_home_.value().c_str();
1539 SynchConfigGetter sync_config_getter( 1539 SynchConfigGetter sync_config_getter(
1540 new ProxyConfigServiceLinux(env)); 1540 new ProxyConfigServiceLinux(env));
1541 ProxyConfig config; 1541 ProxyConfig config;
1542 sync_config_getter.SetupAndInitialFetch(); 1542 sync_config_getter.SetupAndInitialFetch();
1543 EXPECT_EQ(ProxyConfigService::CONFIG_VALID, 1543 EXPECT_EQ(ProxyConfigService::CONFIG_VALID,
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « net/proxy/proxy_config_service_linux.cc ('k') | net/test/python_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698