EDK: Make mojo::embedder::AsyncWait (etc.) take an std::function instead of a base::Callback.

mojo/edk/embedder/embedder.h

 // Copyright 2014 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 MOJO_EDK_EMBEDDER_EMBEDDER_H_
 #define MOJO_EDK_EMBEDDER_EMBEDDER_H_
 
+#include <functional>
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
-#include "base/task_runner.h"
 #include "mojo/edk/embedder/channel_info_forward.h"
 #include "mojo/edk/embedder/platform_task_runner.h"
 #include "mojo/edk/embedder/process_type.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/edk/embedder/slave_info.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 
 namespace mojo {
 namespace embedder {
 
@@ skipping 18 matching lines @@
 // Basic functions -------------------------------------------------------------
 
 // The functions in this section are available once |Init()| has been called.
 
 // Start waiting on the handle asynchronously. On success, |callback| will be
 // called exactly once, when |handle| satisfies a signal in |signals| or it
 // becomes known that it will never do so. |callback| will be executed on an
 // arbitrary thread, so it must not call any Mojo system or embedder functions.
 MojoResult AsyncWait(MojoHandle handle,
                      MojoHandleSignals signals,
-                     const base::Callback<void(MojoResult)>& callback);
+                     const std::function<void(MojoResult)>& callback);
 
 // Creates a |MojoHandle| that wraps the given |PlatformHandle| (taking
 // ownership of it). This |MojoHandle| can then, e.g., be passed through message
 // pipes. Note: This takes ownership (and thus closes) |platform_handle| even on
 // failure, which is different from what you'd expect from a Mojo API, but it
 // makes for a more convenient embedder API.
 MojoResult CreatePlatformHandleWrapper(
     ScopedPlatformHandle platform_handle,
     MojoHandle* platform_handle_wrapper_handle);
 
@@ skipping 165 matching lines @@
 
 // Inform the channel that it will soon be destroyed (doing so is optional).
 // This may be called from any thread, but the caller must ensure that this is
 // called before |DestroyChannel()|.
 void WillDestroyChannelSoon(ChannelInfo* channel_info);
 
 }  // namespace embedder
 }  // namespace mojo
 
 #endif  // MOJO_EDK_EMBEDDER_EMBEDDER_H_