diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 12:20:12 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-06 12:20:12 +0000 |
| commit | 79c71b3cf46a6cd35d36db03d8cf7236957ef554 (patch) | |
| tree | 813b359cbdf20f4a9a4d1717ea1a963c02c4b4b1 /net | |
| parent | 48b03754b6f842eea4b179cbe9b7716ce893083b (diff) | |
| download | chromium_src-79c71b3cf46a6cd35d36db03d8cf7236957ef554.zip chromium_src-79c71b3cf46a6cd35d36db03d8cf7236957ef554.tar.gz chromium_src-79c71b3cf46a6cd35d36db03d8cf7236957ef554.tar.bz2 | |
Temporarily disable gconf usage from ProxyConfigServiceLinux because of Glib races.
Patch by Stephane Doyon.
BUG=11442
Review URL: http://codereview.chromium.org/109040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15404 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/proxy/proxy_config_service_linux.cc | 3 | ||||
| -rw-r--r-- | net/proxy/proxy_config_service_linux_unittest.cc | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index 0d6f067..3c94cdf 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -513,6 +513,8 @@ int ProxyConfigServiceLinux::GetProxyConfig(ProxyConfig* config) { // Note: KDE_FULL_SESSION is a corresponding env var to recognize KDE. std::string dummy, desktop_session; bool ok = false; +#if 0 // gconf temporarily disabled because of races. + // See http://crbug.com/11442. if (env_var_getter_->Getenv("GNOME_DESKTOP_SESSION_ID", &dummy) || (env_var_getter_->Getenv("DESKTOP_SESSION", &desktop_session) && desktop_session.compare("gnome") == 0)) { @@ -543,6 +545,7 @@ int ProxyConfigServiceLinux::GetProxyConfig(ProxyConfig* config) { // actually changed. } } +#endif // 0 (gconf disabled) // An implementation for KDE settings would be welcome here. if (!ok) { ok = GetConfigFromEnv(config); diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc index 9ff2813..035e846 100644 --- a/net/proxy/proxy_config_service_linux_unittest.cc +++ b/net/proxy/proxy_config_service_linux_unittest.cc @@ -205,6 +205,7 @@ class MockGConfSettingGetter // Builds an identifier for each test in an array. #define TEST_DESC(desc) StringPrintf("at line %d <%s>", __LINE__, desc) +#if 0 // gconf temporarily disabled. TEST(ProxyConfigServiceLinuxTest, BasicGConfTest) { MockEnvironmentVariableGetter* env_getter = new MockEnvironmentVariableGetter; @@ -466,6 +467,7 @@ TEST(ProxyConfigServiceLinuxTest, BasicGConfTest) { EXPECT_EQ(tests[i].proxy_rules, config.proxy_rules); } } +#endif // 0 (gconf disabled) TEST(ProxyConfigServiceLinuxTest, BasicEnvTest) { MockEnvironmentVariableGetter* env_getter = |