libchrome: Several upstreamable fixes from libchrome

dbus/object_manager.h

 // Copyright (c) 2013 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 DBUS_OBJECT_MANAGER_H_
 #define DBUS_OBJECT_MANAGER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 148 matching lines @@
 
     // Called by ObjectManager to inform the implementation class that an
     // object has been added with the path |object_path|. The D-Bus interface
     // name |interface_name| is that passed to RegisterInterface() by the
     // implementation class.
     //
     // If a new object implements multiple interfaces, this method will be
     // called on each interface implementation with differing values of
     // |interface_name| as appropriate. An implementation class will only
     // receive multiple calls if it has registered for multiple interfaces.
-    virtual void ObjectAdded(const ObjectPath& object_path,
-                             const std::string& interface_name) { }
+    virtual void ObjectAdded(const ObjectPath& /*object_path*/,
+                             const std::string& /*interface_name*/) {}
 
     // Called by ObjectManager to inform the implementation class than an
     // object with the path |object_path| has been removed. Ths D-Bus interface
     // name |interface_name| is that passed to RegisterInterface() by the
     // implementation class. Multiple interfaces are handled as with
     // ObjectAdded().
     //
     // This method will be called before the Properties structure and the
     // ObjectProxy object for the given interface are cleaned up, it is safe
     // to retrieve them during removal to vary processing.
-    virtual void ObjectRemoved(const ObjectPath& object_path,
-                               const std::string& interface_name) { }
+    virtual void ObjectRemoved(const ObjectPath& /*object_path*/,
+                               const std::string& /*interface_name*/) {}
   };
 
   // Client code should use Bus::GetObjectManager() instead of this constructor.
   ObjectManager(Bus* bus,
                 const std::string& service_name,
                 const ObjectPath& object_path);
 
   // Register a client implementation class |interface| for the given D-Bus
   // interface named in |interface_name|. That object's CreateProperties()
   // method will be used to create instances of dbus::PropertySet* when
@@ skipping 162 matching lines @@
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<ObjectManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectManager);
 };
 
 }  // namespace dbus
 
 #endif  // DBUS_OBJECT_MANAGER_H_