Index: base/nix/xdg_util_unittest.cc |
diff --git a/base/nix/xdg_util_unittest.cc b/base/nix/xdg_util_unittest.cc |
index 1219bba82c5ffc7cd74d5569146228c5bda9b378..32d33c54f3b8e0f101b88b71a8d35ee39e644c34 100644 |
--- a/base/nix/xdg_util_unittest.cc |
+++ b/base/nix/xdg_util_unittest.cc |
@@ -11,7 +11,7 @@ |
using ::testing::_; |
using ::testing::Eq; |
using ::testing::Return; |
-using ::testing::SetArgumentPointee; |
+using ::testing::SetArgPointee; |
namespace base { |
namespace nix { |
@@ -49,7 +49,7 @@ TEST(XDGUtilTest, GetDesktopEnvironmentGnome) { |
MockEnvironment getter; |
EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false)); |
EXPECT_CALL(getter, GetVar(Eq(kDesktopSession), _)) |
- .WillOnce(DoAll(SetArgumentPointee<1>(kDesktopGnome), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<1>(kDesktopGnome), Return(true))); |
EXPECT_EQ(DESKTOP_ENVIRONMENT_GNOME, GetDesktopEnvironment(&getter)); |
} |
@@ -58,7 +58,7 @@ TEST(XDGUtilTest, GetDesktopEnvironmentMATE) { |
MockEnvironment getter; |
EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false)); |
EXPECT_CALL(getter, GetVar(Eq(kDesktopSession), _)) |
- .WillOnce(DoAll(SetArgumentPointee<1>(kDesktopMATE), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<1>(kDesktopMATE), Return(true))); |
EXPECT_EQ(DESKTOP_ENVIRONMENT_GNOME, GetDesktopEnvironment(&getter)); |
} |
@@ -67,7 +67,7 @@ TEST(XDGUtilTest, GetDesktopEnvironmentKDE4) { |
MockEnvironment getter; |
EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false)); |
EXPECT_CALL(getter, GetVar(Eq(kDesktopSession), _)) |
- .WillOnce(DoAll(SetArgumentPointee<1>(kDesktopKDE4), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<1>(kDesktopKDE4), Return(true))); |
EXPECT_EQ(DESKTOP_ENVIRONMENT_KDE4, GetDesktopEnvironment(&getter)); |
} |
@@ -76,7 +76,7 @@ TEST(XDGUtilTest, GetDesktopEnvironmentKDE3) { |
MockEnvironment getter; |
EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false)); |
EXPECT_CALL(getter, GetVar(Eq(kDesktopSession), _)) |
- .WillOnce(DoAll(SetArgumentPointee<1>(kDesktopKDE), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<1>(kDesktopKDE), Return(true))); |
EXPECT_EQ(DESKTOP_ENVIRONMENT_KDE3, GetDesktopEnvironment(&getter)); |
} |
@@ -85,7 +85,7 @@ TEST(XDGUtilTest, GetDesktopEnvironmentXFCE) { |
MockEnvironment getter; |
EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false)); |
EXPECT_CALL(getter, GetVar(Eq(kDesktopSession), _)) |
- .WillOnce(DoAll(SetArgumentPointee<1>(kDesktopXFCE), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<1>(kDesktopXFCE), Return(true))); |
EXPECT_EQ(DESKTOP_ENVIRONMENT_XFCE, GetDesktopEnvironment(&getter)); |
} |
@@ -94,7 +94,7 @@ TEST(XDGUtilTest, GetXdgDesktopGnome) { |
MockEnvironment getter; |
EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false)); |
EXPECT_CALL(getter, GetVar(Eq(kXdgDesktop), _)) |
- .WillOnce(DoAll(SetArgumentPointee<1>(kXdgDesktopGNOME), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<1>(kXdgDesktopGNOME), Return(true))); |
EXPECT_EQ(DESKTOP_ENVIRONMENT_GNOME, GetDesktopEnvironment(&getter)); |
} |
@@ -103,10 +103,9 @@ TEST(XDGUtilTest, GetXdgDesktopGnomeFallback) { |
MockEnvironment getter; |
EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false)); |
EXPECT_CALL(getter, GetVar(Eq(kXdgDesktop), _)) |
- .WillOnce(DoAll(SetArgumentPointee<1>(kXdgDesktopUnity), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<1>(kXdgDesktopUnity), Return(true))); |
EXPECT_CALL(getter, GetVar(Eq(kDesktopSession), _)) |
- .WillOnce( |
- DoAll(SetArgumentPointee<1>(kDesktopGnomeFallback), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<1>(kDesktopGnomeFallback), Return(true))); |
EXPECT_EQ(DESKTOP_ENVIRONMENT_GNOME, GetDesktopEnvironment(&getter)); |
} |
@@ -115,9 +114,9 @@ TEST(XDGUtilTest, GetXdgDesktopKDE5) { |
MockEnvironment getter; |
EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false)); |
EXPECT_CALL(getter, GetVar(Eq(kXdgDesktop), _)) |
- .WillOnce(DoAll(SetArgumentPointee<1>(kXdgDesktopKDE), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<1>(kXdgDesktopKDE), Return(true))); |
EXPECT_CALL(getter, GetVar(Eq(kKDESession), _)) |
- .WillOnce(DoAll(SetArgumentPointee<1>(kKDESessionKDE5), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<1>(kKDESessionKDE5), Return(true))); |
EXPECT_EQ(DESKTOP_ENVIRONMENT_KDE5, GetDesktopEnvironment(&getter)); |
} |
@@ -126,7 +125,7 @@ TEST(XDGUtilTest, GetXdgDesktopKDE4) { |
MockEnvironment getter; |
EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false)); |
EXPECT_CALL(getter, GetVar(Eq(kXdgDesktop), _)) |
- .WillOnce(DoAll(SetArgumentPointee<1>(kXdgDesktopKDE), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<1>(kXdgDesktopKDE), Return(true))); |
EXPECT_EQ(DESKTOP_ENVIRONMENT_KDE4, GetDesktopEnvironment(&getter)); |
} |
@@ -135,7 +134,7 @@ TEST(XDGUtilTest, GetXdgDesktopUnity) { |
MockEnvironment getter; |
EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false)); |
EXPECT_CALL(getter, GetVar(Eq(kXdgDesktop), _)) |
- .WillOnce(DoAll(SetArgumentPointee<1>(kXdgDesktopUnity), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<1>(kXdgDesktopUnity), Return(true))); |
EXPECT_EQ(DESKTOP_ENVIRONMENT_UNITY, GetDesktopEnvironment(&getter)); |
} |
@@ -144,7 +143,7 @@ TEST(XDGUtilTest, GetXdgDesktopUnity7) { |
MockEnvironment getter; |
EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false)); |
EXPECT_CALL(getter, GetVar(Eq(kXdgDesktop), _)) |
- .WillOnce(DoAll(SetArgumentPointee<1>(kXdgDesktopUnity7), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<1>(kXdgDesktopUnity7), Return(true))); |
EXPECT_EQ(DESKTOP_ENVIRONMENT_UNITY, GetDesktopEnvironment(&getter)); |
} |
@@ -153,7 +152,7 @@ TEST(XDGUtilTest, GetXdgDesktopUnity8) { |
MockEnvironment getter; |
EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false)); |
EXPECT_CALL(getter, GetVar(Eq(kXdgDesktop), _)) |
- .WillOnce(DoAll(SetArgumentPointee<1>(kXdgDesktopUnity8), Return(true))); |
+ .WillOnce(DoAll(SetArgPointee<1>(kXdgDesktopUnity8), Return(true))); |
EXPECT_EQ(DESKTOP_ENVIRONMENT_UNITY, GetDesktopEnvironment(&getter)); |
} |