Index: mojo/public/cpp/bindings/tests/binding_callback_unittest.cc |
diff --git a/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc b/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc |
index 6f00d2e980dde1c9d4c840b99f7da9ce989b211d..0f438598eb41822b6de9f73853bf3c7f60aac815 100644 |
--- a/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc |
+++ b/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc |
@@ -51,7 +51,7 @@ class InterfaceImpl : public sample::Provider { |
public: |
InterfaceImpl() |
: last_server_value_seen_(0), |
- callback_saved_(new Callback<void(int32_t)>()) {} |
+ callback_saved_(new EchoIntCallback) {} |
~InterfaceImpl() override { |
if (callback_saved_) { |
@@ -78,7 +78,7 @@ class InterfaceImpl : public sample::Provider { |
// sample::Provider implementation |
// Saves its two input values in member variables and does nothing else. |
- void EchoInt(int32_t x, const Callback<void(int32_t)>& callback) override { |
+ void EchoInt(int32_t x, const EchoIntCallback& callback) override { |
last_server_value_seen_ = x; |
*callback_saved_ = callback; |
if (!closure_.is_null()) { |
@@ -88,24 +88,23 @@ class InterfaceImpl : public sample::Provider { |
} |
void EchoString(const String& a, |
- const Callback<void(String)>& callback) override { |
+ const EchoStringCallback& callback) override { |
CHECK(false) << "Not implemented."; |
} |
void EchoStrings(const String& a, |
const String& b, |
- const Callback<void(String, String)>& callback) override { |
+ const EchoStringsCallback& callback) override { |
CHECK(false) << "Not implemented."; |
} |
void EchoMessagePipeHandle( |
ScopedMessagePipeHandle a, |
- const Callback<void(ScopedMessagePipeHandle)>& callback) override { |
+ const EchoMessagePipeHandleCallback& callback) override { |
CHECK(false) << "Not implemented."; |
} |
- void EchoEnum(sample::Enum a, |
- const Callback<void(sample::Enum)>& callback) override { |
+ void EchoEnum(sample::Enum a, const EchoEnumCallback& callback) override { |
CHECK(false) << "Not implemented."; |
} |
@@ -117,7 +116,7 @@ class InterfaceImpl : public sample::Provider { |
private: |
int32_t last_server_value_seen_; |
- Callback<void(int32_t)>* callback_saved_; |
+ EchoIntCallback* callback_saved_; |
base::Closure closure_; |
}; |