[Android] Use a "unique" remote debugging socket name on bind failure

chrome/browser/android/dev_tools_server.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/dev_tools_server.h"
 
 #include <pwd.h>
 #include <cstring>
 
 #include "base/android/jni_string.h"
@@ skipping 16 matching lines @@
 #include "jni/DevToolsServer_jni.h"
 #include "net/socket/unix_domain_socket_posix.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 const char kFrontEndURL[] =
     "http://chrome-devtools-frontend.appspot.com/static/%s/devtools.html";
 const char kDefaultSocketName[] = "chrome_devtools_remote";
-const char kTetheringSocketName[] = "chrome_devtools_tethering_%d";
+const char kTetheringSocketName[] = "chrome_devtools_tethering_%d_%d";
 
 // Delegate implementation for the devtools http handler on android. A new
 // instance of this gets created each time devtools is enabled.
 class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
  public:
   explicit DevToolsServerDelegate(bool use_bundled_frontend_resources)
       : use_bundled_frontend_resources_(use_bundled_frontend_resources),
         last_tethering_socket_(0) {
   }
 
@@ skipping 37 matching lines @@
     return kTargetTypeTab;
   }
 
   virtual std::string GetViewDescription(content::RenderViewHost*) OVERRIDE {
     return "";
   }
 
   virtual scoped_refptr<net::StreamListenSocket> CreateSocketForTethering(
       net::StreamListenSocket::Delegate* delegate,
       std::string* name) OVERRIDE {
-    *name = base::StringPrintf(kTetheringSocketName, ++last_tethering_socket_);
+    *name = base::StringPrintf(
+        kTetheringSocketName, getpid(), ++last_tethering_socket_);
     return net::UnixDomainSocket::CreateAndListenWithAbstractNamespace(
         *name,
+        "",
         delegate,
         base::Bind(&content::CanUserConnectToDevTools));
   }
 
  private:
   static void PopulatePageThumbnails() {
     Profile* profile =
         ProfileManager::GetLastUsedProfile()->GetOriginalProfile();
     history::TopSites* top_sites = profile->GetTopSites();
     if (top_sites)
@@ skipping 33 matching lines @@
 
 void DevToolsServer::Start() {
   if (protocol_handler_)
     return;
 
   chrome::VersionInfo version_info;
 
   protocol_handler_ = content::DevToolsHttpHandler::Start(
       new net::UnixDomainSocketWithAbstractNamespaceFactory(
           socket_name_,
+          base::StringPrintf("%s_%d", socket_name_.c_str(), getpid()),
           base::Bind(&content::CanUserConnectToDevTools)),
       use_bundled_frontend_resources_ ?
           "" :
           base::StringPrintf(kFrontEndURL, version_info.Version().c_str()),
       new DevToolsServerDelegate(use_bundled_frontend_resources_));
 }
 
 void DevToolsServer::Stop() {
   if (!protocol_handler_)
     return;
@@ skipping 35 matching lines @@
                                       jobject obj,
                                       jint server,
                                       jboolean enabled) {
   DevToolsServer* devtools_server = reinterpret_cast<DevToolsServer*>(server);
   if (enabled) {
     devtools_server->Start();
   } else {
     devtools_server->Stop();
   }
 }