linux: generalize desktop environment guessing to encompass KDE

net/proxy/proxy_config_service_linux_unittest.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "net/proxy/proxy_config_service_linux.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/thread.h"
 #include "base/waitable_event.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service_common_unittest.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace {
 
 // Set of values for all environment variables that we might
 // query. NULL represents an unset variable.
 struct EnvVarValues {
   // The strange capitalization is so that the field matches the
   // environment variable name exactly.
-  const char *GNOME_DESKTOP_SESSION_ID, *DESKTOP_SESSION,
+  const char *DESKTOP_SESSION, *GNOME_DESKTOP_SESSION_ID, *KDE_FULL_SESSION,
       *auto_proxy, *all_proxy,
       *http_proxy, *https_proxy, *ftp_proxy,
       *SOCKS_SERVER, *SOCKS_VERSION,
       *no_proxy;
 };
 
 // Undo macro pollution from GDK includes (from message_loop.h).
 #undef TRUE
 #undef FALSE
 
@@ skipping 31 matching lines @@
     return *value_ptr;
   }
 
   map_type settings;
 };
 
 class MockEnvironmentVariableGetter : public base::EnvironmentVariableGetter {
  public:
   MockEnvironmentVariableGetter() {
 #define ENTRY(x) table.settings[#x] = &values.x
+    ENTRY(DESKTOP_SESSION);
     ENTRY(GNOME_DESKTOP_SESSION_ID);
-    ENTRY(DESKTOP_SESSION);
+    ENTRY(KDE_FULL_SESSION);
     ENTRY(auto_proxy);
     ENTRY(all_proxy);
     ENTRY(http_proxy);
     ENTRY(https_proxy);
     ENTRY(ftp_proxy);
     ENTRY(no_proxy);
     ENTRY(SOCKS_SERVER);
     ENTRY(SOCKS_VERSION);
 #undef ENTRY
     Reset();
@@ skipping 488 matching lines @@
     // Expected outputs (fields of the ProxyConfig).
     bool auto_detect;
     GURL pac_url;
     ProxyConfig::ProxyRules proxy_rules;
     const char* proxy_bypass_list;  // newline separated
     bool bypass_local_names;
   } tests[] = {
     {
       TEST_DESC("No proxying"),
       { // Input.
-        NULL, NULL,  // *DESKTOP*
+        NULL, NULL, NULL,  // *DESKTOP*
         NULL,  // auto_proxy
         NULL,  // all_proxy
         NULL, NULL, NULL,  // per-proto proxies
         NULL, NULL,  // SOCKS
         "*",  // no_proxy
       },
 
       // Expected result.
       false,                      // auto_detect
       GURL(),                     // pac_url
       ProxyConfig::ProxyRules(),  // proxy_rules
       "",                         // proxy_bypass_list
       false,                      // bypass_local_names
     },
 
     {
       TEST_DESC("Auto detect"),
       { // Input.
-        NULL, NULL,  // *DESKTOP*
+        NULL, NULL, NULL,  // *DESKTOP*
         "",  // auto_proxy
         NULL,  // all_proxy
         NULL, NULL, NULL,  // per-proto proxies
         NULL, NULL,  // SOCKS
         NULL,  // no_proxy
       },
 
       // Expected result.
       true,                       // auto_detect
       GURL(),                     // pac_url
       ProxyConfig::ProxyRules(),  // proxy_rules
       "",                         // proxy_bypass_list
       false,                      // bypass_local_names
     },
 
     {
       TEST_DESC("Valid PAC url"),
       { // Input.
-        NULL, NULL,  // *DESKTOP*
+        NULL, NULL, NULL,  // *DESKTOP*
         "http://wpad/wpad.dat",  // auto_proxy
         NULL,  // all_proxy
         NULL, NULL, NULL,  // per-proto proxies
         NULL, NULL,  // SOCKS
         NULL,  // no_proxy
       },
 
       // Expected result.
       false,                         // auto_detect
       GURL("http://wpad/wpad.dat"),  // pac_url
       ProxyConfig::ProxyRules(),     // proxy_rules
       "",                            // proxy_bypass_list
       false,                         // bypass_local_names
     },
 
     {
       TEST_DESC("Invalid PAC url"),
       { // Input.
-        NULL, NULL,  // *DESKTOP*
+        NULL, NULL, NULL,  // *DESKTOP*
         "wpad.dat",  // auto_proxy
         NULL,  // all_proxy
         NULL, NULL, NULL,  // per-proto proxies
         NULL, NULL,  // SOCKS
         NULL,  // no_proxy
       },
 
       // Expected result.
       false,                       // auto_detect
       GURL(),                     // pac_url
       ProxyConfig::ProxyRules(),  // proxy_rules
       "",                         // proxy_bypass_list
       false,                      // bypass_local_names
     },
 
     {
       TEST_DESC("Single-host in proxy list"),
       { // Input.
-        NULL, NULL,  // *DESKTOP*
+        NULL, NULL, NULL,  // *DESKTOP*
         NULL,  // auto_proxy
         "www.google.com",  // all_proxy
         NULL, NULL, NULL,  // per-proto proxies
         NULL, NULL,  // SOCKS
         NULL,  // no_proxy
       },
 
       // Expected result.
       false,                                   // auto_detect
       GURL(),                                  // pac_url
       MakeSingleProxyRules("www.google.com"),  // proxy_rules
       "",                                      // proxy_bypass_list
       false,                                   // bypass_local_names
     },
 
     {
       TEST_DESC("Single-host, different port"),
       { // Input.
-        NULL, NULL,  // *DESKTOP*
+        NULL, NULL, NULL,  // *DESKTOP*
         NULL,  // auto_proxy
         "www.google.com:99",  // all_proxy
         NULL, NULL, NULL,  // per-proto proxies
         NULL, NULL,  // SOCKS
         NULL,  // no_proxy
       },
 
       // Expected result.
       false,                                   // auto_detect
       GURL(),                                  // pac_url
       MakeSingleProxyRules("www.google.com:99"),  // proxy_rules
       "",                                      // proxy_bypass_list
       false,                                   // bypass_local_names
     },
 
     {
       TEST_DESC("Tolerate a scheme"),
       { // Input.
-        NULL, NULL,  // *DESKTOP*
+        NULL, NULL, NULL,  // *DESKTOP*
         NULL,  // auto_proxy
         "http://www.google.com:99",  // all_proxy
         NULL, NULL, NULL,  // per-proto proxies
         NULL, NULL,  // SOCKS
         NULL,  // no_proxy
       },
 
       // Expected result.
       false,                                   // auto_detect
       GURL(),                                  // pac_url
       MakeSingleProxyRules("www.google.com:99"),  // proxy_rules
       "",                                      // proxy_bypass_list
       false,                                   // bypass_local_names
     },
 
     {
       TEST_DESC("Per-scheme proxy rules"),
       { // Input.
-        NULL, NULL,  // *DESKTOP*
+        NULL, NULL, NULL,  // *DESKTOP*
         NULL,  // auto_proxy
         NULL,  // all_proxy
         "www.google.com:80", "www.foo.com:110", "ftpfoo.com:121",  // per-proto
         NULL, NULL,  // SOCKS
         NULL,  // no_proxy
       },
 
       // Expected result.
       false,                                   // auto_detect
       GURL(),                                  // pac_url
       MakeProxyPerSchemeRules("www.google.com", "www.foo.com:110",
                               "ftpfoo.com:121"),
       "",                                      // proxy_bypass_list
       false,                                   // bypass_local_names
     },
 
     {
       TEST_DESC("socks"),
       { // Input.
-        NULL, NULL,  // *DESKTOP*
+        NULL, NULL, NULL,  // *DESKTOP*
         NULL,  // auto_proxy
         "",  // all_proxy
         NULL, NULL, NULL,  // per-proto proxies
         "socks.com:888", NULL,  // SOCKS
         NULL,  // no_proxy
       },
 
       // Expected result.
       false,                                   // auto_detect
       GURL(),                                  // pac_url
       MakeSingleProxyRules("socks4://socks.com:888"),  // proxy_rules
       "",                                      // proxy_bypass_list
       false,                                   // bypass_local_names
     },
 
     {
       TEST_DESC("socks5"),
       { // Input.
-        NULL, NULL,  // *DESKTOP*
+        NULL, NULL, NULL,  // *DESKTOP*
         NULL,  // auto_proxy
         "",  // all_proxy
         NULL, NULL, NULL,  // per-proto proxies
         "socks.com:888", "5",  // SOCKS
         NULL,  // no_proxy
       },
 
       // Expected result.
       false,                                   // auto_detect
       GURL(),                                  // pac_url
       MakeSingleProxyRules("socks5://socks.com:888"),  // proxy_rules
       "",                                      // proxy_bypass_list
       false,                                   // bypass_local_names
     },
 
     {
       TEST_DESC("socks default port"),
       { // Input.
-        NULL, NULL,  // *DESKTOP*
+        NULL, NULL, NULL,  // *DESKTOP*
         NULL,  // auto_proxy
         "",  // all_proxy
         NULL, NULL, NULL,  // per-proto proxies
         "socks.com", NULL,  // SOCKS
         NULL,  // no_proxy
       },
 
       // Expected result.
       false,                                   // auto_detect
       GURL(),                                  // pac_url
       MakeSingleProxyRules("socks4://socks.com"),  // proxy_rules
       "",                                      // proxy_bypass_list
       false,                                   // bypass_local_names
     },
 
     {
       TEST_DESC("bypass"),
       { // Input.
-        NULL, NULL,  // *DESKTOP*
+        NULL, NULL, NULL,  // *DESKTOP*
         NULL,  // auto_proxy
         "www.google.com",  // all_proxy
         NULL, NULL, NULL,  // per-proto
         NULL, NULL,  // SOCKS
         ".google.com, foo.com:99, 1.2.3.4:22, 127.0.0.1/8",  // no_proxy
       },
 
       false,                      // auto_detect
       GURL(),                     // pac_url
       MakeSingleProxyRules("www.google.com"),  // proxy_rules
@@ skipping 67 matching lines @@
 
   // Now set to auto-detect.
   gconf_getter->values.mode = "auto";
   // Simulate gconf notification callback.
   service.OnCheckProxyConfigSettings();
   sync_config_getter.SyncGetProxyConfig(&config);
   EXPECT_TRUE(config.auto_detect);
 }
 
 }  // namespace net