libchrome: Several upstreamable fixes from libchrome

dbus/object_manager.cc

 // 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.
 
 #include "dbus/object_manager.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 231 matching lines @@
 }
 
 // static
 DBusHandlerResult ObjectManager::HandleMessageThunk(DBusConnection* connection,
                                                     DBusMessage* raw_message,
                                                     void* user_data) {
   ObjectManager* self = reinterpret_cast<ObjectManager*>(user_data);
   return self->HandleMessage(connection, raw_message);
 }
 
-DBusHandlerResult ObjectManager::HandleMessage(DBusConnection* connection,
+DBusHandlerResult ObjectManager::HandleMessage(DBusConnection*,
                                                DBusMessage* raw_message) {
   DCHECK(bus_);
   bus_->AssertOnDBusThread();
 
   // Handle the message only if it is a signal.
   // Note that the match rule in SetupMatchRuleAndFilter() is configured to
   // only accept signals, but we check here just in case.
   if (dbus_message_get_type(raw_message) != DBUS_MESSAGE_TYPE_SIGNAL)
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
@@ skipping 115 matching lines @@
   if (!reader.PopObjectPath(&object_path)) {
     LOG(WARNING) << service_name_ << " " << object_path_.value()
                  << ": InterfacesAdded signal has incorrect parameters: "
                  << signal->ToString();
     return;
   }
 
   UpdateObject(object_path, &reader);
 }
 
-void ObjectManager::InterfacesAddedConnected(const std::string& interface_name,
-                                             const std::string& signal_name,
-                                             bool success) {
+void ObjectManager::InterfacesAddedConnected(
+    const std::string& /*interface_name*/,
+    const std::string& /*signal_name*/,
+    bool success) {
   LOG_IF(WARNING, !success) << service_name_ << " " << object_path_.value()
                             << ": Failed to connect to InterfacesAdded signal.";
 }
 
 void ObjectManager::InterfacesRemovedReceived(Signal* signal) {
   DCHECK(signal);
   MessageReader reader(signal);
   ObjectPath object_path;
   std::vector<std::string> interface_names;
   if (!reader.PopObjectPath(&object_path) ||
       !reader.PopArrayOfStrings(&interface_names)) {
     LOG(WARNING) << service_name_ << " " << object_path_.value()
                  << ": InterfacesRemoved signal has incorrect parameters: "
                  << signal->ToString();
     return;
   }
 
   for (size_t i = 0; i < interface_names.size(); ++i)
     RemoveInterface(object_path, interface_names[i]);
 }
 
 void ObjectManager::InterfacesRemovedConnected(
-    const std::string& interface_name,
-    const std::string& signal_name,
+    const std::string& /*interface_name*/,
+    const std::string& /*signal_name*/,
     bool success) {
   LOG_IF(WARNING, !success) << service_name_ << " " << object_path_.value()
                             << ": Failed to connect to "
                             << "InterfacesRemoved signal.";
 }
 
 void ObjectManager::UpdateObject(const ObjectPath& object_path,
                                  MessageReader* reader) {
   DCHECK(reader);
   MessageReader array_reader(NULL);
@@ skipping 101 matching lines @@
         RemoveInterface(object_path, *iiter);
     }
 
   }
 
   if (!new_owner.empty())
     GetManagedObjects();
 }
 
 }  // namespace dbus