Use fixed socket name instead of SecureSocketWithKey

chrome/common/service_process_util.h

 // 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.
 
 #ifndef CHROME_COMMON_SERVICE_PROCESS_UTIL_H_
 #define CHROME_COMMON_SERVICE_PROCESS_UTIL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 14 matching lines @@
 #endif
 
 namespace base {
 class CommandLine;
 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.
 // Caller is responsible for ownership of the MultiProcessLock.
 MultiProcessLock* TakeNamedLock(const std::string& name, bool waiting);
 #endif
 
 // The following methods are used in a process that acts as a client to the
 // service process (typically the browser process).
 // --------------------------------------------------------------------------
@@ skipping 73 matching lines @@
 
   // An opaque object that maintains state. The actual definition of this is
   // platform dependent.
   struct StateData;
   StateData* state_;
   scoped_ptr<base::SharedMemory> shared_mem_service_data_;
   scoped_ptr<base::CommandLine> autorun_command_line_;
 };
 
 #endif  // CHROME_COMMON_SERVICE_PROCESS_UTIL_H_