Move EnvironmentVariableGetter from base/linux_util.h to base/env_var.h. Labe...

net/proxy/proxy_config_service_linux_unittest.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "net/proxy/proxy_config_service_linux.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
@@ skipping 58 matching lines @@
     typename map_type::const_iterator it = settings.find(key);
     // In case there's a typo or the unittest becomes out of sync.
     CHECK(it != settings.end()) << "key " << key << " not found";
     value_type* value_ptr = it->second;
     return *value_ptr;
   }
 
   map_type settings;
 };
 
-class MockEnvironmentVariableGetter : public base::EnvironmentVariableGetter {
+class MockEnvVarGetter : public base::EnvVarGetter {
  public:
-  MockEnvironmentVariableGetter() {
+  MockEnvVarGetter() {
 #define ENTRY(x) table.settings[#x] = &values.x
     ENTRY(DESKTOP_SESSION);
     ENTRY(KDE_HOME);
     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();
   }
 
   // Zeros all environment values.
   void Reset() {
     EnvVarValues zero_values = { 0 };
     values = zero_values;
   }
 
-  virtual bool Getenv(const char* variable_name, std::string* result) {
+  virtual bool GetEnv(const char* variable_name, std::string* result) {
     const char* env_value = table.Get(variable_name);
     if (env_value) {
       // Note that the variable may be defined but empty.
       *result = env_value;
       return true;
     }
     return false;
   }
 
   // Intentionally public, for convenience when setting up a test.
@@ skipping 454 matching lines @@
       GURL(),                                         // pac_url
       ProxyRulesExpectation::Single(
           "www.google.com:80",   // single proxy
           "*.google.com"),       // bypass rules
     },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     SCOPED_TRACE(StringPrintf("Test[%" PRIuS "] %s", i,
                               tests[i].description.c_str()));
-    MockEnvironmentVariableGetter* env_getter =
-        new MockEnvironmentVariableGetter;
+    MockEnvVarGetter* env_getter = new MockEnvVarGetter;
     MockGConfSettingGetter* gconf_getter = new MockGConfSettingGetter;
     SynchConfigGetter sync_config_getter(
         new ProxyConfigServiceLinux(env_getter, gconf_getter));
     ProxyConfig config;
     gconf_getter->values = tests[i].values;
     sync_config_getter.SetupAndInitialFetch();
     sync_config_getter.SyncGetProxyConfig(&config);
 
     EXPECT_EQ(tests[i].auto_detect, config.auto_detect());
     EXPECT_EQ(tests[i].pac_url, config.pac_url());
@@ skipping 246 matching lines @@
       ProxyRulesExpectation::Single(
           "www.google.com:80",
           // TODO(eroman): 127.0.0.1/8 is unsupported, so it was dropped
           "*.google.com,*foo.com:99,1.2.3.4:22"),
     },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     SCOPED_TRACE(StringPrintf("Test[%" PRIuS "] %s", i,
                               tests[i].description.c_str()));
-    MockEnvironmentVariableGetter* env_getter =
-        new MockEnvironmentVariableGetter;
+    MockEnvVarGetter* env_getter = new MockEnvVarGetter;
     MockGConfSettingGetter* gconf_getter = new MockGConfSettingGetter;
     SynchConfigGetter sync_config_getter(
         new ProxyConfigServiceLinux(env_getter, gconf_getter));
     ProxyConfig config;
     env_getter->values = tests[i].values;
     sync_config_getter.SetupAndInitialFetch();
     sync_config_getter.SyncGetProxyConfig(&config);
 
     EXPECT_EQ(tests[i].auto_detect, config.auto_detect());
     EXPECT_EQ(tests[i].pac_url, config.pac_url());
     EXPECT_TRUE(tests[i].proxy_rules.Matches(config.proxy_rules()));
   }
 }
 
 TEST_F(ProxyConfigServiceLinuxTest, GconfNotification) {
-  MockEnvironmentVariableGetter* env_getter =
-      new MockEnvironmentVariableGetter;
+  MockEnvVarGetter* env_getter = new MockEnvVarGetter;
   MockGConfSettingGetter* gconf_getter = new MockGConfSettingGetter;
   ProxyConfigServiceLinux* service =
       new ProxyConfigServiceLinux(env_getter, gconf_getter);
   SynchConfigGetter sync_config_getter(service);
   ProxyConfig config;
 
   // Start with no proxy.
   gconf_getter->values.mode = "none";
   sync_config_getter.SetupAndInitialFetch();
   sync_config_getter.SyncGetProxyConfig(&config);
@@ skipping 283 matching lines @@
           "www.google.com:80",  // http
           "",                   // https
           "ftp.foo.com:80",     // ftp
           ""),                  // bypass rules
     },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
     SCOPED_TRACE(StringPrintf("Test[%" PRIuS "] %s", i,
                               tests[i].description.c_str()));
-    MockEnvironmentVariableGetter* env_getter =
-        new MockEnvironmentVariableGetter;
+    MockEnvVarGetter* env_getter = new MockEnvVarGetter;
     // Force the KDE getter to be used and tell it where the test is.
     env_getter->values.DESKTOP_SESSION = "kde4";
     env_getter->values.KDE_HOME = kde_home_.value().c_str();
     SynchConfigGetter sync_config_getter(
         new ProxyConfigServiceLinux(env_getter));
     ProxyConfig config;
     // Overwrite the kioslaverc file.
     file_util::WriteFile(kioslaverc_, tests[i].kioslaverc.c_str(),
                          tests[i].kioslaverc.length());
     sync_config_getter.SetupAndInitialFetch();
     sync_config_getter.SyncGetProxyConfig(&config);
 
     EXPECT_EQ(tests[i].auto_detect, config.auto_detect());
     EXPECT_EQ(tests[i].pac_url, config.pac_url());
     EXPECT_TRUE(tests[i].proxy_rules.Matches(config.proxy_rules()));
   }
 }
 
 }  // namespace net