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

net/proxy/proxy_config_service_linux.h

-// 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.
 
 #ifndef NET_PROXY_PROXY_CONFIG_SERVICE_LINUX_H_
 #define NET_PROXY_PROXY_CONFIG_SERVICE_LINUX_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/linux_util.h"
+#include "base/env_var.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_server.h"
 
 namespace net {
 
 // Implementation of ProxyConfigService that retrieves the system proxy
@@ skipping 75 matching lines @@
   // The substance of the ProxyConfigServiceLinux implementation is
   // wrapped in the Delegate ref counted class. On deleting the
   // ProxyConfigServiceLinux, Delegate::OnDestroy() is posted to the
   // UI thread where gconf notifications will be safely stopped before
   // releasing Delegate.
 
   class Delegate : public base::RefCountedThreadSafe<Delegate> {
    public:
     // Constructor receives env var getter implementation to use, and
     // takes ownership of it. This is the normal constructor.
-    explicit Delegate(base::EnvironmentVariableGetter* env_var_getter);
+    explicit Delegate(base::EnvVarGetter* env_var_getter);
     // Constructor receives gconf and env var getter implementations
     // to use, and takes ownership of them. Used for testing.
-    Delegate(base::EnvironmentVariableGetter* env_var_getter,
+    Delegate(base::EnvVarGetter* env_var_getter,
              GConfSettingGetter* gconf_getter);
     // Synchronously obtains the proxy configuration. If gconf is
     // used, also enables gconf notification for setting
     // changes. gconf must only be accessed from the thread running
     // the default glib main loop, and so this method must be called
     // from the UI thread. The message loop for the IO thread is
     // specified so that notifications can post tasks to it (and for
     // assertions). The message loop for the file thread is used to
     // read any files needed to determine proxy settings.
     void SetupAndFetchInitialConfig(MessageLoop* glib_default_loop,
@@ skipping 39 matching lines @@
     bool GetProxyFromGConf(const char* key_prefix, bool is_socks,
                            ProxyServer* result_server);
     // Fills proxy config from gconf. Returns true if settings were found
     // and the configuration is valid.
     bool GetConfigFromGConf(ProxyConfig* config);
 
     // This method is posted from the UI thread to the IO thread to
     // carry the new config information.
     void SetNewProxyConfig(const ProxyConfig& new_config);
 
-    scoped_ptr<base::EnvironmentVariableGetter> env_var_getter_;
+    scoped_ptr<base::EnvVarGetter> env_var_getter_;
     scoped_ptr<GConfSettingGetter> gconf_getter_;
 
     // Cached proxy configuration, to be returned by
     // GetProxyConfig. Initially populated from the UI thread, but
     // afterwards only accessed from the IO thread.
     ProxyConfig cached_config_;
 
     // A copy kept on the UI thread of the last seen proxy config, so as
     // to avoid posting a call to SetNewProxyConfig when we get a
     // notification but the config has not actually changed.
@@ skipping 14 matching lines @@
     MessageLoop* io_loop_;
 
     DISALLOW_COPY_AND_ASSIGN(Delegate);
   };
 
   // Thin wrapper shell around Delegate.
 
   // Usual constructor
   ProxyConfigServiceLinux();
   // For testing: take alternate gconf and env var getter implementations.
-  explicit ProxyConfigServiceLinux(
-      base::EnvironmentVariableGetter* env_var_getter);
-  ProxyConfigServiceLinux(base::EnvironmentVariableGetter* env_var_getter,
+  explicit ProxyConfigServiceLinux(base::EnvVarGetter* env_var_getter);
+  ProxyConfigServiceLinux(base::EnvVarGetter* env_var_getter,
                           GConfSettingGetter* gconf_getter);
 
   virtual ~ProxyConfigServiceLinux() {
     delegate_->PostDestroyTask();
   }
 
   void SetupAndFetchInitialConfig(MessageLoop* glib_default_loop,
                                   MessageLoop* io_loop,
                                   MessageLoopForIO* file_loop) {
     delegate_->SetupAndFetchInitialConfig(glib_default_loop, io_loop,
@@ skipping 11 matching lines @@
 
  private:
   scoped_refptr<Delegate> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceLinux);
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_CONFIG_SERVICE_LINUX_H_