Remove use of std::function from Mojo internals

mojo/edk/system/ports/ports_unittest.cc

 // Copyright 2016 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 <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <map>
@@ skipping 154 matching lines @@
     base::AutoLock lock(lock_);
     drop_messages_ = value;
   }
 
   void set_save_messages(bool value) {
     base::AutoLock lock(lock_);
     save_messages_ = value;
   }
 
   bool ReadMessage(const PortRef& port, ScopedMessage* message) {
-    return node_.GetMessage(port, message) == OK && *message;
+    return node_.GetMessage(port, message, nullptr) == OK && *message;
   }
 
   bool GetSavedMessage(ScopedMessage* message) {
     base::AutoLock lock(lock_);
     if (saved_messages_.empty()) {
       message->reset();
       return false;
     }
     std::swap(*message, saved_messages_.front());
     saved_messages_.pop();
@@ skipping 388 matching lines @@
   WaitForIdle();
 
   node1.set_drop_messages(true);
 
   RemoveNode(&node1);
 
   WaitForIdle();
 
   // a0 should have eventually detected peer closure after node loss.
   ScopedMessage message;
-  EXPECT_EQ(ERROR_PORT_PEER_CLOSED, node0.node().GetMessage(a0, &message));
+  EXPECT_EQ(ERROR_PORT_PEER_CLOSED,
+            node0.node().GetMessage(a0, &message, nullptr));
   EXPECT_FALSE(message);
 
   EXPECT_EQ(OK, node0.node().ClosePort(a0));
 
   EXPECT_EQ(OK, node0.node().ClosePort(x0));
 
-  EXPECT_EQ(OK, node1.node().GetMessage(x1, &message));
+  EXPECT_EQ(OK, node1.node().GetMessage(x1, &message, nullptr));
   EXPECT_TRUE(message);
   node1.ClosePortsInMessage(message.get());
 
   EXPECT_EQ(OK, node1.node().ClosePort(x1));
 
   WaitForIdle();
 
   EXPECT_TRUE(node0.node().CanShutdownCleanly());
   EXPECT_TRUE(node1.node().CanShutdownCleanly());
 }
@@ skipping 116 matching lines @@
 }
 
 TEST_F(PortsTest, GetMessage1) {
   TestNode node(0);
   AddNode(&node);
 
   PortRef a0, a1;
   EXPECT_EQ(OK, node.node().CreatePortPair(&a0, &a1));
 
   ScopedMessage message;
-  EXPECT_EQ(OK, node.node().GetMessage(a0, &message));
+  EXPECT_EQ(OK, node.node().GetMessage(a0, &message, nullptr));
   EXPECT_FALSE(message);
 
   EXPECT_EQ(OK, node.node().ClosePort(a1));
 
   WaitForIdle();
 
-  EXPECT_EQ(ERROR_PORT_PEER_CLOSED, node.node().GetMessage(a0, &message));
+  EXPECT_EQ(ERROR_PORT_PEER_CLOSED,
+            node.node().GetMessage(a0, &message, nullptr));
   EXPECT_FALSE(message);
 
   EXPECT_EQ(OK, node.node().ClosePort(a0));
 
   WaitForIdle();
 
   EXPECT_TRUE(node.node().CanShutdownCleanly());
 }
 
 TEST_F(PortsTest, GetMessage2) {
   TestNode node(0);
   AddNode(&node);
 
   PortRef a0, a1;
   EXPECT_EQ(OK, node.node().CreatePortPair(&a0, &a1));
 
   EXPECT_EQ(OK, node.SendStringMessage(a1, "1"));
 
   ScopedMessage message;
-  EXPECT_EQ(OK, node.node().GetMessage(a0, &message));
+  EXPECT_EQ(OK, node.node().GetMessage(a0, &message, nullptr));
 
   ASSERT_TRUE(message);
   EXPECT_TRUE(MessageEquals(message, "1"));
 
   EXPECT_EQ(OK, node.node().ClosePort(a0));
   EXPECT_EQ(OK, node.node().ClosePort(a1));
 
   EXPECT_TRUE(node.node().CanShutdownCleanly());
 }
 
 TEST_F(PortsTest, GetMessage3) {
   TestNode node(0);
   AddNode(&node);
 
   PortRef a0, a1;
   EXPECT_EQ(OK, node.node().CreatePortPair(&a0, &a1));
 
   const char* kStrings[] = {
     "1",
     "2",
     "3"
   };
 
   for (size_t i = 0; i < sizeof(kStrings)/sizeof(kStrings[0]); ++i)
     EXPECT_EQ(OK, node.SendStringMessage(a1, kStrings[i]));
 
   ScopedMessage message;
   for (size_t i = 0; i < sizeof(kStrings)/sizeof(kStrings[0]); ++i) {
-    EXPECT_EQ(OK, node.node().GetMessage(a0, &message));
+    EXPECT_EQ(OK, node.node().GetMessage(a0, &message, nullptr));
     ASSERT_TRUE(message);
     EXPECT_TRUE(MessageEquals(message, kStrings[i]));
   }
 
   EXPECT_EQ(OK, node.node().ClosePort(a0));
   EXPECT_EQ(OK, node.node().ClosePort(a1));
 
   EXPECT_TRUE(node.node().CanShutdownCleanly());
 }
 
@@ skipping 672 matching lines @@
 
   // Expect everything to have gone away.
   EXPECT_TRUE(node0.node().CanShutdownCleanly());
   EXPECT_TRUE(node1.node().CanShutdownCleanly());
 }
 
 }  // namespace test
 }  // namespace ports
 }  // namespace edk
 }  // namespace mojo