libchrome: Several upstreamable fixes from libchrome

base/trace_event/trace_event.h

Index: base/trace_event/trace_event.h
diff --git a/base/trace_event/trace_event.h b/base/trace_event/trace_event.h
index faaccac8eaf34b40ff91b81e633df44246266a6a..a07589826978826842f6a255017005d49a2d7186 100644
--- a/base/trace_event/trace_event.h
+++ b/base/trace_event/trace_event.h
@@ -474,9 +474,8 @@ class TraceID {
   TraceID(ForceMangle raw_id, unsigned int* flags) : raw_id_(raw_id.raw_id()) {
     *flags |= TRACE_EVENT_FLAG_MANGLE_ID;
   }
-  TraceID(DontMangle maybe_scoped_id, unsigned int* flags)
-      : scope_(maybe_scoped_id.scope()), raw_id_(maybe_scoped_id.raw_id()) {
-  }
+  TraceID(DontMangle maybe_scoped_id, unsigned int* /*flags*/)
+      : scope_(maybe_scoped_id.scope()), raw_id_(maybe_scoped_id.raw_id()) {}
   TraceID(unsigned long long raw_id, unsigned int* flags) : raw_id_(raw_id) {
     (void)flags;
   }
@@ -502,7 +501,7 @@ class TraceID {
       : raw_id_(static_cast<unsigned long long>(raw_id)) { (void)flags; }
   TraceID(signed char raw_id, unsigned int* flags)
       : raw_id_(static_cast<unsigned long long>(raw_id)) { (void)flags; }
-  TraceID(WithScope scoped_id, unsigned int* flags)
+  TraceID(WithScope scoped_id, unsigned int* /*flags*/)
       : scope_(scoped_id.scope()), raw_id_(scoped_id.raw_id()) {}
 
   unsigned long long raw_id() const { return raw_id_; }