libchrome: Several upstreamable fixes from libchrome

base/trace_event/trace_event.h

 // Copyright (c) 2012 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.
 
 #ifndef BASE_TRACE_EVENT_TRACE_EVENT_H_
 #define BASE_TRACE_EVENT_TRACE_EVENT_H_
 
 // This header file defines implementation details of how the trace macros in
 // trace_event_common.h collect and store trace events. Anything not
 // implementation-specific should go in trace_event_common.h instead of here.
@@ skipping 456 matching lines @@
     unsigned long long raw_id_;
   };
   TraceID(const void* raw_id, unsigned int* flags)
       : raw_id_(static_cast<unsigned long long>(
                 reinterpret_cast<uintptr_t>(raw_id))) {
     *flags |= TRACE_EVENT_FLAG_MANGLE_ID;
   }
   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;
   }
   TraceID(unsigned long raw_id, unsigned int* flags) : raw_id_(raw_id) {
     (void)flags;
   }
   TraceID(unsigned int raw_id, unsigned int* flags) : raw_id_(raw_id) {
     (void)flags;
   }
   TraceID(unsigned short raw_id, unsigned int* flags) : raw_id_(raw_id) {
     (void)flags;
   }
   TraceID(unsigned char raw_id, unsigned int* flags) : raw_id_(raw_id) {
     (void)flags;
   }
   TraceID(long long raw_id, unsigned int* flags)
       : raw_id_(static_cast<unsigned long long>(raw_id)) { (void)flags; }
   TraceID(long raw_id, unsigned int* flags)
       : raw_id_(static_cast<unsigned long long>(raw_id)) { (void)flags; }
   TraceID(int raw_id, unsigned int* flags)
       : raw_id_(static_cast<unsigned long long>(raw_id)) { (void)flags; }
   TraceID(short raw_id, unsigned int* flags)
       : 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_; }
   const char* scope() const { return scope_; }
 
  private:
   const char* scope_ = nullptr;
   unsigned long long raw_id_;
 };
 
@@ skipping 567 matching lines @@
   const char* name_;
   IDType id_;
 
   DISALLOW_COPY_AND_ASSIGN(TraceScopedTrackableObject);
 };
 
 }  // namespace trace_event
 }  // namespace base
 
 #endif  // BASE_TRACE_EVENT_TRACE_EVENT_H_