| Index: mojo/public/cpp/bindings/lib/interface_impl_internal.h
|
| diff --git a/mojo/public/cpp/bindings/lib/interface_impl_internal.h b/mojo/public/cpp/bindings/lib/interface_impl_internal.h
|
| index 788da664a36a8d9e4cff360087027870e952c862..492b1822496749d6d68dea24f71fc866d5193a11 100644
|
| --- a/mojo/public/cpp/bindings/lib/interface_impl_internal.h
|
| +++ b/mojo/public/cpp/bindings/lib/interface_impl_internal.h
|
| @@ -30,8 +30,8 @@ class InterfaceImplState : public ErrorHandler {
|
| typedef typename Interface::Client Client;
|
|
|
| explicit InterfaceImplState(InterfaceImplBase<Interface>* instance)
|
| - : router_(NULL),
|
| - proxy_(NULL),
|
| + : router_(nullptr),
|
| + proxy_(nullptr),
|
| instance_bound_to_pipe_(false)
|
| #ifndef NDEBUG
|
| ,
|
| @@ -48,7 +48,7 @@ class InterfaceImplState : public ErrorHandler {
|
| #endif
|
| delete proxy_;
|
| if (router_) {
|
| - router_->set_error_handler(NULL);
|
| + router_->set_error_handler(nullptr);
|
| delete router_;
|
| }
|
| }
|
|
|