| Index: mojo/public/cpp/application/lazy_interface_ptr.h
|
| diff --git a/mojo/public/cpp/application/lazy_interface_ptr.h b/mojo/public/cpp/application/lazy_interface_ptr.h
|
| index 908ea0854b83ea12541fbfc9b37983f9bb1b6bb9..1f4b9733a1fb47a9180a6e5b09c10b71413941d7 100644
|
| --- a/mojo/public/cpp/application/lazy_interface_ptr.h
|
| +++ b/mojo/public/cpp/application/lazy_interface_ptr.h
|
| @@ -5,8 +5,6 @@
|
| #ifndef MOJO_PUBLIC_CPP_APPLICATION_LAZY_INTERFACE_PTR_H_
|
| #define MOJO_PUBLIC_CPP_APPLICATION_LAZY_INTERFACE_PTR_H_
|
|
|
| -#include <string>
|
| -
|
| #include "mojo/public/cpp/application/connect.h"
|
| #include "mojo/public/interfaces/application/service_provider.mojom.h"
|
|
|
| @@ -15,7 +13,7 @@ namespace mojo {
|
| template<typename Interface>
|
| class LazyInterfacePtr : public InterfacePtr<Interface> {
|
| public:
|
| - LazyInterfacePtr() : service_provider_(NULL) {}
|
| + LazyInterfacePtr() : service_provider_(nullptr) {}
|
|
|
| LazyInterfacePtr(ServiceProvider* service_provider)
|
| : service_provider_(service_provider) {
|
|
|