Fix gcc 4.7 compilation errors in chromeos_unittests

gcc 4.7 gives the following error when compiling chromeos_unittests on Linux (with chromeos=1):

../../chromeos/dbus/cros_disks_client_unittest.cc: In member function 'virtual void chromeos::CrosDisksClientTest_DiskInfo_Test::TestBody()':
../../chromeos/dbus/cros_disks_client_unittest.cc:125:3: error: converting 'false' to pointer type for argument 1 of 'char testing::internal::IsNullLiteralHelper(testing::internal::Secret*)' [-Werror=conversion-null]

See googletest issue 322 (https://code.google.com/p/googletest/issues/detail?id=322) for details.

This CL works around the issue by switching the unit test from EXPECT_EQ(false, something) to EXPECT_TRUE(false == something)

BUG=None
TEST=Build and run chromeos_unittests with gcc 4.7

Review URL: https://chromiumcodereview.appspot.com/18339011

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

1 files changed, 8 insertions, 1 deletions

diff --git a/chromeos/dbus/cros_disks_client_unittest.cc b/chromeos/dbus/cros_disks_client_unittest.cc
index 91abc8f..ce2c77c 100644
--- a/chromeos/dbus/cros_disks_client_unittest.cc
+++ b/chromeos/dbus/cros_disks_client_unittest.cc
@@ -122,7 +122,14 @@ TEST(CrosDisksClientTest, DiskInfo) {
   EXPECT_EQ(kDeviceFile, result.device_path());
   EXPECT_EQ(kDeviceIsDrive, result.is_drive());
   EXPECT_EQ(kDeviceIsReadOnly, result.is_read_only());
-  EXPECT_EQ(kDevicePresentationHide, result.is_hidden());
+  // Use EXPECT_TRUE(kDevicePresentationHide == result.is_hidden()) instead of
+  // EXPECT_EQ(kDevicePresentationHide, result.is_hidden()) as gcc 4.7 issues
+  // the following warning on EXPECT_EQ(false, x), which is turned into an error
+  // with -Werror=conversion-null:
+  //
+  //   converting 'false' to pointer type for argument 1 of
+  //   'char testing::internal::IsNullLiteralHelper(testing::internal::Secret*)'
+  EXPECT_TRUE(kDevicePresentationHide == result.is_hidden());
   EXPECT_EQ(kDeviceIsMediaAvailable, result.has_media());
   EXPECT_EQ(kDeviceIsOnBootDevice, result.on_boot_device());
   EXPECT_EQ(kNativePath, result.system_path());