diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-02 14:48:25 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-06-01 16:56:06 +0000 |
commit | 4d61ba751088f650fe5d22bbf88036e80ff19f0f (patch) | |
tree | a1583bd501cfd675655396775108a9b7b3881b95 /src/core/dev_tools_http_handler_delegate_qt.cpp | |
parent | 06a60e33c6101d725d8b88d4e3c647b9b2d3e7ab (diff) |
Basic porting to Chromium 51
Trivial changes in methods, arguments and types.
Change-Id: Ic707c376249f816268223e696ed5f6251df1f85f
Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/dev_tools_http_handler_delegate_qt.cpp')
-rw-r--r-- | src/core/dev_tools_http_handler_delegate_qt.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/dev_tools_http_handler_delegate_qt.cpp b/src/core/dev_tools_http_handler_delegate_qt.cpp index f3ffcc86d..0e127d414 100644 --- a/src/core/dev_tools_http_handler_delegate_qt.cpp +++ b/src/core/dev_tools_http_handler_delegate_qt.cpp @@ -50,6 +50,7 @@ #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "components/devtools_discovery/devtools_discovery_manager.h" @@ -178,7 +179,7 @@ DevToolsTargetDescriptor::List DevToolsDiscoveryProviderQt::GetDescriptors() namespace QtWebEngineCore { -scoped_ptr<DevToolsHttpHandler> createDevToolsHttpHandler() +std::unique_ptr<DevToolsHttpHandler> createDevToolsHttpHandler() { DevToolsHttpHandlerDelegateQt *delegate = new DevToolsHttpHandlerDelegateQt(); if (!delegate->isValid()) { @@ -187,9 +188,9 @@ scoped_ptr<DevToolsHttpHandler> createDevToolsHttpHandler() } scoped_ptr<DevToolsHttpHandler::ServerSocketFactory> factory(new TCPServerSocketFactory(delegate->bindAddress().toStdString(), delegate->port(), 1)); // Ownership of the delegate is taken over the devtools http handler. - scoped_ptr<DevToolsHttpHandler> handler(new DevToolsHttpHandler(std::move(factory), std::string(), delegate, base::FilePath(), base::FilePath(), std::string(), std::string())); + std::unique_ptr<DevToolsHttpHandler> handler(new DevToolsHttpHandler(std::move(factory), std::string(), delegate, base::FilePath(), base::FilePath(), std::string(), std::string())); DevToolsDiscoveryManager::GetInstance()->AddProvider(scoped_ptr<DevToolsDiscoveryManager::Provider>(new DevToolsDiscoveryProviderQt())); - return handler; + return std::move(handler); } DevToolsHttpHandlerDelegateQt::DevToolsHttpHandlerDelegateQt() |