Correctly handle multiple convertable argument names.

Correctly handle multiple convertable argument names.

This fixes an issue when two convertable types are provided we would
only record one of the argument names. We also correclty handle
convertable names when the argument name is set to be copied.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=195227

[dsinclair, 2013-04-15 14:20:23]

brettw, can you please take a look for base OWNERS.

Thanks,
dan

[dsinclair, 2013-04-17 13:40:04]

nduca, PTAL.

[nduca, 2013-04-17 21:58:52]

lgtm

[dsinclair, 2013-04-18 00:22:55]

brettw, ping.

[dsinclair, 2013-04-18 20:05:49]

jar, can you PTAL for base OWNERS.

Thanks,
dan

[jar (doing other things), 2013-04-18 21:32:57]

lgtm

[commit-bot: I haz the power, 2013-04-19 00:43:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dsinclair@chromium.org/14244010/1

[commit-bot: I haz the power, 2013-04-19 14:56:51]

Failed to apply patch for base/debug/trace_event.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file base/debug/trace_event.h
  Hunk #1 succeeded at 1060 (offset 17 lines).
  Hunk #2 FAILED at 1052.
  1 out of 2 hunks FAILED -- saving rejects to file base/debug/trace_event.h.rej

Patch:       base/debug/trace_event.h
Index: base/debug/trace_event.h
diff --git a/base/debug/trace_event.h b/base/debug/trace_event.h
index
838b2a6dd904b6f57f44bc6eccc0e61143a83194..88ecbd438f761b413658dee026ccaa58463b34ce
100644
--- a/base/debug/trace_event.h
+++ b/base/debug/trace_event.h
@@ -1043,6 +1043,7 @@ static inline void AddTraceEventWithThreadIdAndTimestamp(
     const char* arg2_name,
     scoped_ptr<base::debug::ConvertableToTraceFormat> arg2_val) {
   const int num_args = 2;
+  const char* arg_names[2] = { arg1_name, arg2_name };
   unsigned char arg_types[2] =
       { TRACE_VALUE_TYPE_CONVERTABLE, TRACE_VALUE_TYPE_CONVERTABLE };
   scoped_ptr<base::debug::ConvertableToTraceFormat> convertable_values[2];
@@ -1051,7 +1052,7 @@ static inline void AddTraceEventWithThreadIdAndTimestamp(
 
   TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(
       phase, category_enabled, name, id, thread_id, timestamp,
-      num_args, &arg1_name, arg_types, NULL, convertable_values, flags);
+      num_args, arg_names, arg_types, NULL, convertable_values, flags);
 }
 
 static inline void AddTraceEvent(

[commit-bot: I haz the power, 2013-04-19 15:06:31]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dsinclair@chromium.org/14244010/27001

[commit-bot: I haz the power, 2013-04-19 17:50:23]

Change committed as 195227