Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8

mojo/public/tests/test_support_private.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/public/tests/test_support_private.h"
 
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 static mojo::test::TestSupport* g_test_support = NULL;
 
 extern "C" {
 
 void MojoTestSupportLogPerfResult(const char* test_name,
+                                  const char* sub_test_name,
                                   double value,
                                   const char* units) {
-  if (g_test_support)
-    g_test_support->LogPerfResult(test_name, value, units);
-  else
-    printf("[no test runner]\t%s\t%g\t%s\n", test_name, value, units);
+  if (g_test_support) {
+    g_test_support->LogPerfResult(test_name, sub_test_name, value, units);
+  } else {
+    if (sub_test_name) {
+      printf("[no test runner]\t%s/%s\t%g\t%s\n", test_name, sub_test_name,
+             value, units);
+    } else {
+      printf("[no test runner]\t%s\t%g\t%s\n", test_name, value, units);
+    }
+  }
 }
 
 FILE* MojoTestSupportOpenSourceRootRelativeFile(const char* relative_path) {
   if (g_test_support)
     return g_test_support->OpenSourceRootRelativeFile(relative_path);
   printf("[no test runner]\n");
   return NULL;
 }
 
 char** MojoTestSupportEnumerateSourceRootRelativeDirectory(
@@ skipping 28 matching lines @@
   return g_test_support;
 }
 
 // static
 void TestSupport::Reset() {
   g_test_support = NULL;
 }
 
 }  // namespace test
 }  // namespace mojo