Use fixed socket name instead of SecureSocketWithKey

chrome/common/service_process_util.h

Index: chrome/common/service_process_util.h
diff --git a/chrome/common/service_process_util.h b/chrome/common/service_process_util.h
index 9c759d74ce5e462c505c0376caa929dc542d0a65..65621949ba49fcecd45578b877aebe0b3986a148 100644
--- a/chrome/common/service_process_util.h
+++ b/chrome/common/service_process_util.h
@@ -32,22 +32,16 @@ class MessageLoopProxy;
 // Return the IPC channel to connect to the service process.
 IPC::ChannelHandle GetServiceProcessChannel();
 
-#if !defined(OS_MACOSX)
 // Return a name that is scoped to this instance of the service process. We
 // use the user-data-dir as a scoping prefix.
 std::string GetServiceProcessScopedName(const std::string& append_str);
 
+#if !defined(OS_MACOSX)
 // Return a name that is scoped to this instance of the service process. We
 // use the user-data-dir and the version as a scoping prefix.
 std::string GetServiceProcessScopedVersionedName(const std::string& append_str);
 #endif  // OS_MACOSX

[Lei Zhang, 2015/03/12 19:23:48]

This should be !defined(OS_MACOSX)

[Vitaly Buka (NO REVIEWS), 2015/03/12 19:44:13]

Done.

 
-#if defined(OS_MACOSX)
-// Return the name that is used to extract the socket path out of the
-// dictionary provided by launchd.
-NSString* GetServiceProcessLaunchDSocketEnvVar();
-#endif
-
 #if defined(OS_POSIX)
 // Attempts to take a lock named |name|. If |waiting| is true then this will
 // make multiple attempts to acquire the lock.