libchrome: Several upstreamable fixes from libchrome

base/message_loop/message_pump_libevent.cc

Index: base/message_loop/message_pump_libevent.cc
diff --git a/base/message_loop/message_pump_libevent.cc b/base/message_loop/message_pump_libevent.cc
index fef01da9a657820672e56fd2daa6c3d6b17806c9..17feb5b07373a63fb809532b966cd437b10fa6cd 100644
--- a/base/message_loop/message_pump_libevent.cc
+++ b/base/message_loop/message_pump_libevent.cc
@@ -87,7 +87,8 @@ event *MessagePumpLibevent::FileDescriptorWatcher::ReleaseEvent() {
 }
 
 void MessagePumpLibevent::FileDescriptorWatcher::OnFileCanReadWithoutBlocking(
-    int fd, MessagePumpLibevent* pump) {
+    int fd,
+    MessagePumpLibevent* /* pump */) {

[danakj, 2016/05/23 02:59:55]

delete

[Luis Héctor Chávez, 2016/05/24 15:27:53]

Done.

   // Since OnFileCanWriteWithoutBlocking() gets called first, it can stop
   // watching the file descriptor.
   if (!watcher_)
@@ -96,7 +97,8 @@ void MessagePumpLibevent::FileDescriptorWatcher::OnFileCanReadWithoutBlocking(
 }
 
 void MessagePumpLibevent::FileDescriptorWatcher::OnFileCanWriteWithoutBlocking(
-    int fd, MessagePumpLibevent* pump) {
+    int fd,
+    MessagePumpLibevent* /* pump */) {

[danakj, 2016/05/23 02:59:54]

delete

[Luis Héctor Chávez, 2016/05/24 15:27:53]

Done.

   DCHECK(watcher_);
   watcher_->OnFileCanWriteWithoutBlocking(fd);
 }
@@ -195,8 +197,7 @@ bool MessagePumpLibevent::WatchFileDescriptor(int fd,
 }
 
 // Tell libevent to break out of inner loop.
-static void timer_callback(int fd, short events, void *context)
-{
+static void timer_callback(int /* fd */, short /* events */, void* context) {

[danakj, 2016/05/23 02:59:54]

these need names to understand them though.. making them comments makes code
that doesn't follow the google style guide AFAICT. Can you contradict that?

[Luis Héctor Chávez, 2016/05/24 15:27:53]

The google style guide does allow parameter names as comments when they are
unused and are not obvious:
https://google.github.io/styleguide/cppguide.html#Function_Declarations_and_D...

It does not have whitespace around the name, though, so I'll change that.

[danakj, 2016/05/24 18:42:43]

Oh I see. It's not in the initial list of rules, but at the end of that section:
"Unused parameters that might not be obvious should comment out the variable
name in the function definition"

Okay.

   event_base_loopbreak((struct event_base *)context);
 }
 
@@ -347,7 +348,9 @@ void MessagePumpLibevent::OnLibeventNotification(int fd,
 
 // Called if a byte is received on the wakeup pipe.
 // static
-void MessagePumpLibevent::OnWakeup(int socket, short flags, void* context) {
+void MessagePumpLibevent::OnWakeup(int socket,
+                                   short /* flags */,
+                                   void* context) {
   MessagePumpLibevent* that = static_cast<MessagePumpLibevent*>(context);
   DCHECK(that->wakeup_pipe_out_ == socket);