Index: third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_factory.cc |
diff --git a/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_factory.cc b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_factory.cc |
index cfa2b79662c2b1f4210b169765487ab5b6015da6..bb39fc9d55a95bbeb8f9adb2f46482e8d79afcb0 100644 |
--- a/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_factory.cc |
+++ b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_factory.cc |
@@ -19,17 +19,16 @@ ViewManagerClientFactory::~ViewManagerClientFactory() { |
} |
// static |
-scoped_ptr<ViewManagerClient> |
-ViewManagerClientFactory::WeakBindViewManagerToPipe( |
+ViewManagerClient* ViewManagerClientFactory::WeakBindViewManagerToPipe( |
InterfaceRequest<ViewManagerClient> request, |
ViewManagerServicePtr view_manager_service, |
Shell* shell, |
ViewManagerDelegate* delegate) { |
const bool delete_on_error = false; |
- scoped_ptr<ViewManagerClientImpl> client(new ViewManagerClientImpl( |
- delegate, shell, request.Pass(), delete_on_error)); |
+ auto client = new ViewManagerClientImpl(delegate, shell, request.Pass(), |
+ delete_on_error); |
client->SetViewManagerService(view_manager_service.Pass()); |
- return client.Pass(); |
+ return client; |
} |
// InterfaceFactory<ViewManagerClient> implementation. |