base: rename Environment::GetEnv to Environment::GetVar.

base/xdg_util_unittest.cc

Index: base/xdg_util_unittest.cc
diff --git a/base/xdg_util_unittest.cc b/base/xdg_util_unittest.cc
index 09f65c471cb9a1b8ebba579fb56e29ec2b8c5236..c33fca532059754e577e73d55b6c347c988ba930 100644
--- a/base/xdg_util_unittest.cc
+++ b/base/xdg_util_unittest.cc
@@ -17,7 +17,7 @@ namespace {
 
 class MockEnvironment : public base::Environment {
  public:
-  MOCK_METHOD2(GetEnv, bool(const char*, std::string* result));
+  MOCK_METHOD2(GetVar, bool(const char*, std::string* result));
   MOCK_METHOD2(SetVar, bool(const char*, const std::string& new_value));
   MOCK_METHOD1(UnSetVar, bool(const char*));
 };
@@ -31,8 +31,8 @@ const char* kXFCE = "xfce";
 
 TEST(XDGUtilTest, GetDesktopEnvironmentGnome) {
   MockEnvironment getter;
-  EXPECT_CALL(getter, GetEnv(_, _)).WillRepeatedly(Return(false));
-  EXPECT_CALL(getter, GetEnv(StrEq("DESKTOP_SESSION"), _))
+  EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false));
+  EXPECT_CALL(getter, GetVar(StrEq("DESKTOP_SESSION"), _))
       .WillOnce(DoAll(SetArgumentPointee<1>(kGnome), Return(true)));
 
   EXPECT_EQ(base::DESKTOP_ENVIRONMENT_GNOME,
@@ -41,8 +41,8 @@ TEST(XDGUtilTest, GetDesktopEnvironmentGnome) {
 
 TEST(XDGUtilTest, GetDesktopEnvironmentKDE4) {
   MockEnvironment getter;
-  EXPECT_CALL(getter, GetEnv(_, _)).WillRepeatedly(Return(false));
-  EXPECT_CALL(getter, GetEnv(StrEq("DESKTOP_SESSION"), _))
+  EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false));
+  EXPECT_CALL(getter, GetVar(StrEq("DESKTOP_SESSION"), _))
       .WillOnce(DoAll(SetArgumentPointee<1>(kKDE4), Return(true)));
 
   EXPECT_EQ(base::DESKTOP_ENVIRONMENT_KDE4,
@@ -51,8 +51,8 @@ TEST(XDGUtilTest, GetDesktopEnvironmentKDE4) {
 
 TEST(XDGUtilTest, GetDesktopEnvironmentKDE3) {
   MockEnvironment getter;
-  EXPECT_CALL(getter, GetEnv(_, _)).WillRepeatedly(Return(false));
-  EXPECT_CALL(getter, GetEnv(StrEq("DESKTOP_SESSION"), _))
+  EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false));
+  EXPECT_CALL(getter, GetVar(StrEq("DESKTOP_SESSION"), _))
       .WillOnce(DoAll(SetArgumentPointee<1>(kKDE), Return(true)));
 
   EXPECT_EQ(base::DESKTOP_ENVIRONMENT_KDE3,
@@ -61,8 +61,8 @@ TEST(XDGUtilTest, GetDesktopEnvironmentKDE3) {
 
 TEST(XDGUtilTest, GetDesktopEnvironmentXFCE) {
   MockEnvironment getter;
-  EXPECT_CALL(getter, GetEnv(_, _)).WillRepeatedly(Return(false));
-  EXPECT_CALL(getter, GetEnv(StrEq("DESKTOP_SESSION"), _))
+  EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false));
+  EXPECT_CALL(getter, GetVar(StrEq("DESKTOP_SESSION"), _))
       .WillOnce(DoAll(SetArgumentPointee<1>(kXFCE), Return(true)));
 
   EXPECT_EQ(base::DESKTOP_ENVIRONMENT_XFCE,