commit 1abbd48292d8e7d21981af16dc4e7d78b1727c2a
author Gaurav Shah <gauravsh@google.com> Thu Mar 28 11:54:51 2013 -0700
committer ChromeBot <chrome-bot@google.com> Tue Apr 16 12:43:14 2013 -0700
tree a5941aa2b8c5f4b214e98b076564fe70483947a5
parent 8799a4a8aae726eb563dda4b6a9093614375d519

shill: Enable match explainer for KeyValueStore parameteric gtest matcher

BUG=chromium:211445
TEST=build with the dependent upgrade to gtest 1.6 change
CQ-DEPEND=CL:47574

Change-Id: I696a0d39759c24456a443a9bf55a60744a6f1942
Reviewed-on: https://gerrit.chromium.org/gerrit/46782
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Gaurav Shah <gauravsh@chromium.org>
Tested-by: Gaurav Shah <gauravsh@chromium.org>

cellular_capability_gsm_unittest.cc

diff --git a/cellular_capability_gsm_unittest.cc b/cellular_capability_gsm_unittest.cc
index 5d5508b..05fb184 100644
--- a/cellular_capability_gsm_unittest.cc
+++ b/cellular_capability_gsm_unittest.cc
@@ -827,10 +827,6 @@
       value.int_properties() == arg.int_properties() &&
       value.string_properties() == arg.string_properties() &&
       value.uint_properties() == arg.uint_properties();
-#if 0
-  // TODO(gauravsh): Enable the match failure explainer once gtest is
-  //  upgraded to version 1.6 (1.5 is the lowest version that supports
-  // |result_listener| and PrintToString). crbug.com/211445
   if (!match) {
     *result_listener << "\nExpected KeyValueStore:\n"
                      << "\tbool_properties: "
@@ -851,7 +847,6 @@
                      << "\n\tuint_properties: "
                      << testing::PrintToString(arg.uint_properties());
   }
-#endif
   return match;
 }