mojo::Callback -> base::Callback

mojo/public/cpp/bindings/tests/binding_callback_unittest.cc

 // Copyright 2015 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 <stdint.h>
 
 #include "base/bind.h"
+#include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "mojo/public/cpp/test_support/test_support.h"
 #include "mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // The tests in this file are designed to test the interaction between a
 // Callback and its associated Binding. If a Callback is deleted before
 // being used we DCHECK fail--unless the associated Binding has already
 // been closed or deleted. This contract must be explained to the Mojo
 // application developer. For example it is the developer's responsibility to
 // ensure that the Binding is destroyed before an unused Callback is destroyed.
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 namespace mojo {
 namespace test {
 namespace {
 
-// A Runnable object that saves the last value it sees via the
-// provided int32_t*. Used on the client side.
-class ValueSaver {
- public:
-  ValueSaver(int32_t* last_value_seen, const base::Closure& closure)
-      : last_value_seen_(last_value_seen), closure_(closure) {}
-  void Run(int32_t x) const {
-    *last_value_seen_ = x;
-    if (!closure_.is_null()) {
-      closure_.Run();
-      closure_.Reset();
-    }
-  }
+void SaveValue(int32_t* storage, const base::Closure& closure, int32_t value) {
+  *storage = value;
+  if (!closure.is_null())
+    closure.Run();
+}
 
- private:
-  int32_t* const last_value_seen_;
-  mutable base::Closure closure_;
-};
+base::Callback<void(int32_t)> BindValueSaver(int32_t* last_value_seen,
+                                             const base::Closure& closure) {
+  return base::Bind(&SaveValue, last_value_seen, closure);
+}
 
 // An implementation of sample::Provider used on the server side.
 // It only implements one of the methods: EchoInt().
 // All it does is save the values and Callbacks it sees.
 class InterfaceImpl : public sample::Provider {
  public:
   InterfaceImpl()
       : last_server_value_seen_(0),
         callback_saved_(new Callback<void(int32_t)>()) {}
 
@@ skipping 89 matching lines @@
 
   // Initialize the test values.
   server_impl.resetLastServerValueSeen();
   last_client_callback_value_seen_ = 0;
 
   // Invoke the Echo method.
   base::RunLoop run_loop, run_loop2;
   server_impl.set_closure(run_loop.QuitClosure());
   interface_ptr_->EchoInt(
       7,
-      ValueSaver(&last_client_callback_value_seen_, run_loop2.QuitClosure()));
+      BindValueSaver(&last_client_callback_value_seen_,
+                     run_loop2.QuitClosure()));
   run_loop.Run();
 
   // Check that server saw the correct value, but the client has not yet.
   EXPECT_EQ(7, server_impl.last_server_value_seen());
   EXPECT_EQ(0, last_client_callback_value_seen_);
 
   // Now run the Callback.
   server_impl.RunCallback();
   run_loop2.Run();
 
   // Check that the client has now seen the correct value.
   EXPECT_EQ(7, last_client_callback_value_seen_);
 
   // Initialize the test values again.
   server_impl.resetLastServerValueSeen();
   last_client_callback_value_seen_ = 0;
 
   // Invoke the Echo method again.
   base::RunLoop run_loop3, run_loop4;
   server_impl.set_closure(run_loop3.QuitClosure());
   interface_ptr_->EchoInt(
       13,
-      ValueSaver(&last_client_callback_value_seen_, run_loop4.QuitClosure()));
+      BindValueSaver(&last_client_callback_value_seen_,
+                     run_loop4.QuitClosure()));
   run_loop3.Run();
 
   // Check that server saw the correct value, but the client has not yet.
   EXPECT_EQ(13, server_impl.last_server_value_seen());
   EXPECT_EQ(0, last_client_callback_value_seen_);
 
   // Now run the Callback again.
   server_impl.RunCallback();
   run_loop4.Run();
 
@@ skipping 14 matching lines @@
 
     // Initialize the test values.
     server_impl.resetLastServerValueSeen();
     last_client_callback_value_seen_ = 0;
 
     // Invoke the Echo method.
     base::RunLoop run_loop2;
     server_impl.set_closure(run_loop2.QuitClosure());
     interface_ptr_->EchoInt(
         7,
-        ValueSaver(&last_client_callback_value_seen_, base::Closure()));
+        BindValueSaver(&last_client_callback_value_seen_, base::Closure()));
     run_loop2.Run();
   }
   // The binding has now been destroyed and the pipe is closed.
 
   // Check that server saw the correct value, but the client has not yet.
   EXPECT_EQ(7, server_impl.last_server_value_seen());
   EXPECT_EQ(0, last_client_callback_value_seen_);
 
   // Now try to run the Callback. This should do nothing since the pipe
   // is closed.
   EXPECT_TRUE(server_impl.RunCallback());
   PumpMessages();
 
   // Check that the client has still not seen the correct value.
   EXPECT_EQ(0, last_client_callback_value_seen_);
 
   // Attempt to invoke the method again and confirm that an error was
   // encountered.
   interface_ptr_->EchoInt(
       13,
-      ValueSaver(&last_client_callback_value_seen_, base::Closure()));
+      BindValueSaver(&last_client_callback_value_seen_, base::Closure()));
   run_loop.Run();
   EXPECT_TRUE(interface_ptr_.encountered_error());
 }
 
 // Tests that deleting a Callback without running it after the corresponding
 // binding has already been deleted does not result in a crash.
 TEST_F(BindingCallbackTest, DeleteBindingThenDeleteCallback) {
   // Create the ServerImpl.
   InterfaceImpl server_impl;
   {
     // Create the binding in an inner scope so it can be deleted first.
     Binding<sample::Provider> binding(&server_impl, GetProxy(&interface_ptr_));
 
     // Initialize the test values.
     server_impl.resetLastServerValueSeen();
     last_client_callback_value_seen_ = 0;
 
     // Invoke the Echo method.
     base::RunLoop run_loop;
     server_impl.set_closure(run_loop.QuitClosure());
     interface_ptr_->EchoInt(
         7,
-        ValueSaver(&last_client_callback_value_seen_, base::Closure()));
+        BindValueSaver(&last_client_callback_value_seen_, base::Closure()));
     run_loop.Run();
   }
   // The binding has now been destroyed and the pipe is closed.
 
   // Check that server saw the correct value, but the client has not yet.
   EXPECT_EQ(7, server_impl.last_server_value_seen());
   EXPECT_EQ(0, last_client_callback_value_seen_);
 
   // Delete the callback without running it. This should not
   // cause a problem because the insfrastructure can detect that the
@@ skipping 10 matching lines @@
 
   // Initialize the test values.
   server_impl.resetLastServerValueSeen();
   last_client_callback_value_seen_ = 0;
 
   // Invoke the Echo method.
   base::RunLoop run_loop;
   server_impl.set_closure(run_loop.QuitClosure());
   interface_ptr_->EchoInt(
       7,
-      ValueSaver(&last_client_callback_value_seen_, base::Closure()));
+      BindValueSaver(&last_client_callback_value_seen_, base::Closure()));
   run_loop.Run();
 
   // Check that server saw the correct value, but the client has not yet.
   EXPECT_EQ(7, server_impl.last_server_value_seen());
   EXPECT_EQ(0, last_client_callback_value_seen_);
 
   // Now close the Binding.
   binding.Close();
 
   // Delete the callback without running it. This should not
@@ skipping 14 matching lines @@
 
   // Initialize the test values.
   server_impl.resetLastServerValueSeen();
   last_client_callback_value_seen_ = 0;
 
   // Invoke the Echo method.
   base::RunLoop run_loop;
   server_impl.set_closure(run_loop.QuitClosure());
   interface_ptr_->EchoInt(
       7,
-      ValueSaver(&last_client_callback_value_seen_, base::Closure()));
+      BindValueSaver(&last_client_callback_value_seen_, base::Closure()));
   run_loop.Run();
 
   // Check that server saw the correct value, but the client has not yet.
   EXPECT_EQ(7, server_impl.last_server_value_seen());
   EXPECT_EQ(0, last_client_callback_value_seen_);
 
 #if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && !defined(OS_ANDROID)
   // Delete the callback without running it. This should cause a crash in debug
   // builds due to a DCHECK.
   std::string regex("Check failed: !is_valid");
 #if defined(OS_WIN)
   // TODO(msw): Fix MOJO_DCHECK logs and EXPECT_DEATH* on Win: crbug.com/535014
   regex.clear();
 #endif  // OS_WIN
   EXPECT_DEATH_IF_SUPPORTED(server_impl.DeleteCallback(), regex.c_str());
 #endif  // (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) &&
         // !defined(OS_ANDROID)
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo