Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8

mojo/edk/test/test_support_impl.cc

Index: mojo/edk/test/test_support_impl.cc
diff --git a/mojo/edk/test/test_support_impl.cc b/mojo/edk/test/test_support_impl.cc
index fae3a8f32d712ace157000cc0370659a22d4e7d4..34b32cee543835c76c36a5d1090dcaf711e987dc 100644
--- a/mojo/edk/test/test_support_impl.cc
+++ b/mojo/edk/test/test_support_impl.cc
@@ -7,12 +7,16 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <string>
+
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/test/perf_log.h"
 
 namespace mojo {
@@ -44,9 +48,16 @@ TestSupportImpl::~TestSupportImpl() {
 }
 
 void TestSupportImpl::LogPerfResult(const char* test_name,
+                                    const char* sub_test_name,
                                     double value,
                                     const char* units) {
-  base::LogPerfResult(test_name, value, units);
+  DCHECK(test_name);
+  if (sub_test_name) {
+    std::string name = base::StringPrintf("%s/%s", test_name, sub_test_name);
+    base::LogPerfResult(name.c_str(), value, units);
+  } else {
+    base::LogPerfResult(test_name, value, units);
+  }
 }
 
 FILE* TestSupportImpl::OpenSourceRootRelativeFile(const char* relative_path) {