Use fixed socket name instead of SecureSocketWithKey

chrome/common/service_process_util.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/common/service_process_util.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 78 matching lines @@
   if (running_version.CompareTo(service_version) > 0) {
     return SERVICE_OLDER_VERSION_RUNNING;
   } else if (service_version.CompareTo(running_version) > 0) {
     return SERVICE_NEWER_VERSION_RUNNING;
   }
   return SERVICE_SAME_VERSION_RUNNING;
 }
 
 }  // namespace
 
-// Return a name that is scoped to this instance of the service process. We
-// use the hash of the user-data-dir as a scoping prefix. We can't use
-// the user-data-dir itself as we have limits on the size of the lock names.
-std::string GetServiceProcessScopedName(const std::string& append_str) {
-  base::FilePath user_data_dir;
-  PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
-#if defined(OS_WIN)
-  std::string user_data_dir_path = base::WideToUTF8(user_data_dir.value());
-#elif defined(OS_POSIX)
-  std::string user_data_dir_path = user_data_dir.value();
-#endif  // defined(OS_WIN)
-  std::string hash = base::SHA1HashString(user_data_dir_path);
-  std::string hex_hash = base::HexEncode(hash.c_str(), hash.length());
-  return hex_hash + "." + append_str;
-}
 
 // 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) {
   std::string versioned_str;
   chrome::VersionInfo version_info;
   versioned_str.append(version_info.Version());
   versioned_str.append(append_str);
   return GetServiceProcessScopedName(versioned_str);
@@ skipping 17 matching lines @@
       *version = service_data->service_process_version;
     if (pid)
       *pid = service_data->service_process_pid;
     return true;
   }
   return false;
 }
 
 #endif  // !OS_MACOSX
 
+// Return a name that is scoped to this instance of the service process. We
+// use the hash of the user-data-dir as a scoping prefix. We can't use
+// the user-data-dir itself as we have limits on the size of the lock names.
+std::string GetServiceProcessScopedName(const std::string& append_str) {
+  base::FilePath user_data_dir;
+  PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+#if defined(OS_WIN)
+  std::string user_data_dir_path = base::WideToUTF8(user_data_dir.value());
+#elif defined(OS_POSIX)
+  std::string user_data_dir_path = user_data_dir.value();
+#endif  // defined(OS_WIN)
+  std::string hash = base::SHA1HashString(user_data_dir_path);
+  std::string hex_hash = base::HexEncode(hash.c_str(), hash.length());
+  return hex_hash + "." + append_str;
+}
+
 scoped_ptr<base::CommandLine> CreateServiceProcessCommandLine() {
   base::FilePath exe_path;
   PathService::Get(content::CHILD_PROCESS_EXE, &exe_path);
   DCHECK(!exe_path.empty()) << "Unable to get service process binary name.";
   scoped_ptr<base::CommandLine> command_line(new base::CommandLine(exe_path));
   command_line->AppendSwitchASCII(switches::kProcessType,
                                   switches::kServiceProcess);
   static const char* const kSwitchesToCopy[] = {
     switches::kCloudPrintSetupProxy,
     switches::kCloudPrintURL,
@@ skipping 104 matching lines @@
   shared_data->service_process_pid = base::GetCurrentProcId();
   shared_mem_service_data_.reset(shared_mem_service_data.release());
   return true;
 }
 
 IPC::ChannelHandle ServiceProcessState::GetServiceProcessChannel() {
   return ::GetServiceProcessChannel();
 }
 
 #endif  // !OS_MACOSX