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

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

Issue 680943002: [DevTools] Migrate DevToolsHttpHandlerDelegate::CreateSocketForTethering to StreamSocket (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 6 years, 1 month 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 a65c7bb9d5053c3b3ab5d2807b05e7573ae281dc..96fe4735cb988ca6bf8832d4962fe8500510a68a 100644
--- a/chrome/browser/android/dev_tools_server.cc
+++ b/chrome/browser/android/dev_tools_server.cc
@@ -67,6 +67,8 @@ const char kFrontEndURL[] =
"http://chrome-devtools-frontend.appspot.com/serve_rev/%s/devtools.html";
const char kTetheringSocketName[] = "chrome_devtools_tethering_%d_%d";
+const int kBackLog = 10;
+
bool AuthorizeSocketAccessWithDebugPermission(
const net::UnixDomainServerSocket::Credentials& credentials) {
JNIEnv* env = base::android::AttachCurrentThread();
@@ -86,7 +88,7 @@ class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
auth_callback_(auth_callback) {
}
- virtual std::string GetDiscoveryPageHTML() override {
+ std::string GetDiscoveryPageHTML() override {
// TopSites updates itself after a delay. Ask TopSites to update itself
// when we're about to show the remote debugging landing page.
content::BrowserThread::PostTask(
@@ -97,22 +99,24 @@ class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
}
- virtual bool BundlesFrontendResources() override {
+ bool BundlesFrontendResources() override {
return false;
}
- virtual base::FilePath GetDebugFrontendDir() override {
+ base::FilePath GetDebugFrontendDir() override {
return base::FilePath();
}
- virtual scoped_ptr<net::StreamListenSocket> CreateSocketForTethering(
- net::StreamListenSocket::Delegate* delegate,
- std::string* name) override {
+ scoped_ptr<net::ServerSocket>
+ CreateSocketForTethering(std::string* name) override {
*name = base::StringPrintf(
kTetheringSocketName, getpid(), ++last_tethering_socket_);
- return net::deprecated::UnixDomainListenSocket::
- CreateAndListenWithAbstractNamespace(
- *name, "", delegate, auth_callback_);
+ scoped_ptr<net::UnixDomainServerSocket> socket(
+ new net::UnixDomainServerSocket(auth_callback_, true));
+ if (socket->ListenWithAddressAndPort(*name, 0, kBackLog) != net::OK)
+ return scoped_ptr<net::ServerSocket>();
+
+ return socket.Pass();
}
private:
« no previous file with comments | « android_webview/native/aw_dev_tools_server.cc ('k') | chrome/browser/devtools/browser_list_tabcontents_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698