base: Rename EnvVarGetter to Environment.

Now EnvVarGetter do much more than getting environment variables.

Per suggestion from Pawel in http://codereview.chromium.org/3043018/.

BUG=None
TEST=trybots

Signed-off-by: Thiago Farina <tfarina@chromium.org>

Review URL: http://codereview.chromium.org/3052034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54696 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/base/xdg_util_unittest.cc b/base/xdg_util_unittest.cc
index 24671b1..c876466 100644
--- a/base/xdg_util_unittest.cc
+++ b/base/xdg_util_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/xdg_util.h"
 
-#include "base/env_var.h"
+#include "base/environment.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -15,7 +15,7 @@ using ::testing::StrEq;
 
 namespace {
 
-class MockEnvVarGetter : public base::EnvVarGetter {
+class MockEnvironment : public base::Environment {
  public:
   MOCK_METHOD2(GetEnv, bool(const char*, std::string* result));
   MOCK_METHOD2(SetEnv, bool(const char*, const std::string& new_value));
@@ -30,7 +30,7 @@ const char* kXFCE = "xfce";
 }  // namespace
 
 TEST(XDGUtilTest, GetDesktopEnvironmentGnome) {
-  MockEnvVarGetter getter;
+  MockEnvironment getter;
   EXPECT_CALL(getter, GetEnv(_, _)).WillRepeatedly(Return(false));
   EXPECT_CALL(getter, GetEnv(StrEq("DESKTOP_SESSION"), _))
       .WillOnce(DoAll(SetArgumentPointee<1>(kGnome), Return(true)));
@@ -40,7 +40,7 @@ TEST(XDGUtilTest, GetDesktopEnvironmentGnome) {
 }
 
 TEST(XDGUtilTest, GetDesktopEnvironmentKDE4) {
-  MockEnvVarGetter getter;
+  MockEnvironment getter;
   EXPECT_CALL(getter, GetEnv(_, _)).WillRepeatedly(Return(false));
   EXPECT_CALL(getter, GetEnv(StrEq("DESKTOP_SESSION"), _))
       .WillOnce(DoAll(SetArgumentPointee<1>(kKDE4), Return(true)));
@@ -50,7 +50,7 @@ TEST(XDGUtilTest, GetDesktopEnvironmentKDE4) {
 }
 
 TEST(XDGUtilTest, GetDesktopEnvironmentKDE3) {
-  MockEnvVarGetter getter;
+  MockEnvironment getter;
   EXPECT_CALL(getter, GetEnv(_, _)).WillRepeatedly(Return(false));
   EXPECT_CALL(getter, GetEnv(StrEq("DESKTOP_SESSION"), _))
       .WillOnce(DoAll(SetArgumentPointee<1>(kKDE), Return(true)));
@@ -60,7 +60,7 @@ TEST(XDGUtilTest, GetDesktopEnvironmentKDE3) {
 }
 
 TEST(XDGUtilTest, GetDesktopEnvironmentXFCE) {
-  MockEnvVarGetter getter;
+  MockEnvironment getter;
   EXPECT_CALL(getter, GetEnv(_, _)).WillRepeatedly(Return(false));
   EXPECT_CALL(getter, GetEnv(StrEq("DESKTOP_SESSION"), _))
       .WillOnce(DoAll(SetArgumentPointee<1>(kXFCE), Return(true)));