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 acdb6b589d5bd7225c51eeb82d05122367aeb6f8..8b175fd2d97ef8a7e6c76c8747ebb92002032d44 100644 |
--- a/chrome/browser/android/dev_tools_server.cc |
+++ b/chrome/browser/android/dev_tools_server.cc |
@@ -77,6 +77,12 @@ static GURL GetFaviconURLForContents(WebContents* web_contents) { |
return GURL(); |
} |
+bool AuthenticateSocketAccess(pid_t pid, uid_t uid, gid_t gid) { |
+ JNIEnv* env = base::android::AttachCurrentThread(); |
+ return Java_DevToolsServer_checkPermission(env, pid, uid) || |
+ content::CanUserConnectToDevTools(pid, uid, gid); |
byungchul
2014/08/01 16:45:16
wrong indentation, 4 whitespaces.
SeRya
2014/08/04 10:47:03
Done.
|
+} |
+ |
class TargetBase : public content::DevToolsTarget { |
public: |
// content::DevToolsTarget implementation: |
@@ -371,7 +377,7 @@ class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate { |
*name, |
"", |
delegate, |
- base::Bind(&content::CanUserConnectToDevTools)) |
+ base::Bind(&AuthenticateSocketAccess)) |
.PassAs<net::StreamListenSocket>(); |
} |
@@ -427,7 +433,7 @@ void DevToolsServer::Start() { |
new net::deprecated::UnixDomainListenSocketWithAbstractNamespaceFactory( |
socket_name_, |
base::StringPrintf("%s_%d", socket_name_.c_str(), getpid()), |
- base::Bind(&content::CanUserConnectToDevTools)), |
+ base::Bind(&AuthenticateSocketAccess)), |
base::StringPrintf(kFrontEndURL, content::GetWebKitRevision().c_str()), |
new DevToolsServerDelegate(), |
base::FilePath()); |