Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Unified Diff: chrome/browser/android/dev_tools_server.cc

Issue 1551033002: Convert Pass()→std::move() in //chrome (Android edition) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Enable RVO by making types match Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/dev_tools_server.cc
diff --git a/chrome/browser/android/dev_tools_server.cc b/chrome/browser/android/dev_tools_server.cc
index 6bde69ede047642ce796c49a3338fa09423f7704..9e7af035615e454012537908f6f7744b2715176c 100644
--- a/chrome/browser/android/dev_tools_server.cc
+++ b/chrome/browser/android/dev_tools_server.cc
@@ -6,6 +6,7 @@
#include <pwd.h>
#include <cstring>
+#include <utility>
#include "base/android/context_utils.h"
#include "base/android/jni_string.h"
@@ -155,14 +156,14 @@ class UnixDomainServerSocketFactory
true /* use_abstract_namespace */));
if (socket->ListenWithAddressAndPort(socket_name_, 0, kBackLog) == net::OK)
- return socket.Pass();
+ return socket;
// Try a fallback socket name.
const std::string fallback_address(
base::StringPrintf("%s_%d", socket_name_.c_str(), getpid()));
if (socket->ListenWithAddressAndPort(fallback_address, 0, kBackLog)
== net::OK)
- return socket.Pass();
+ return socket;
return scoped_ptr<net::ServerSocket>();
}
@@ -170,12 +171,12 @@ class UnixDomainServerSocketFactory
scoped_ptr<net::ServerSocket> CreateForTethering(std::string* name) override {
*name = base::StringPrintf(
kTetheringSocketName, getpid(), ++last_tethering_socket_);
- scoped_ptr<net::UnixDomainServerSocket> socket(
+ scoped_ptr<net::ServerSocket> socket(
new net::UnixDomainServerSocket(auth_callback_, true));
if (socket->ListenWithAddressAndPort(*name, 0, kBackLog) != net::OK)
return scoped_ptr<net::ServerSocket>();
- return socket.Pass();
+ return socket;
}
std::string socket_name_;
@@ -214,13 +215,10 @@ void DevToolsServer::Start(bool allow_debug_permission) {
scoped_ptr<DevToolsHttpHandler::ServerSocketFactory> factory(
new UnixDomainServerSocketFactory(socket_name_, auth_callback));
devtools_http_handler_.reset(new DevToolsHttpHandler(
- factory.Pass(),
+ std::move(factory),
base::StringPrintf(kFrontEndURL, content::GetWebKitRevision().c_str()),
- new DevToolsServerDelegate(),
- base::FilePath(),
- base::FilePath(),
- version_info::GetProductNameAndVersionForUserAgent(),
- ::GetUserAgent()));
+ new DevToolsServerDelegate(), base::FilePath(), base::FilePath(),
+ version_info::GetProductNameAndVersionForUserAgent(), ::GetUserAgent()));
}
void DevToolsServer::Stop() {
« no previous file with comments | « chrome/browser/android/data_usage/data_use_matcher.cc ('k') | chrome/browser/android/feedback/connectivity_checker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698