Chromium Code Reviews

Unified Diff: services/http_server/http_server_app.cc

Issue 1517743003: Make ApplicationRunner's ctor's ApplicationDelegate* argument an std::unique_ptr instead. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « services/device_info/device_info.cc ('k') | services/nacl/nonsfi/pnacl_compile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/http_server/http_server_app.cc
diff --git a/services/http_server/http_server_app.cc b/services/http_server/http_server_app.cc
index 8ff7b12579d3bc4aa7f2b27021e7a340816c67c6..fa063fa59c988c58cf45a7f38cbb7cce7e57c61b 100644
--- a/services/http_server/http_server_app.cc
+++ b/services/http_server/http_server_app.cc
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_delegate.h"
#include "mojo/public/cpp/application/application_impl.h"
@@ -41,12 +42,13 @@ class HttpServerApp : public mojo::ApplicationDelegate,
}
mojo::ApplicationImpl* app_;
- scoped_ptr<HttpServerFactoryImpl> http_server_factory_;
+ std::unique_ptr<HttpServerFactoryImpl> http_server_factory_;
};
} // namespace http_server
MojoResult MojoMain(MojoHandle application_request) {
- mojo::ApplicationRunner runner(new http_server::HttpServerApp);
+ mojo::ApplicationRunner runner(std::unique_ptr<http_server::HttpServerApp>(
+ new http_server::HttpServerApp()));
return runner.Run(application_request);
}
« no previous file with comments | « services/device_info/device_info.cc ('k') | services/nacl/nonsfi/pnacl_compile.cc » ('j') | no next file with comments »

Powered by Google App Engine