Cloud Print Policy - service side enforcement, Mac browser tests.

chrome/common/service_process_util_linux.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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_posix.h"
 
 #include <signal.h>
 #include <unistd.h>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/threading/platform_thread.h"
 #include "chrome/common/auto_start_linux.h"
 #include "chrome/common/multi_process_lock.h"
 
 namespace {
 
-// 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) {
-  scoped_ptr<MultiProcessLock> lock(MultiProcessLock::Create(name));
-  if (lock == NULL) return NULL;
-  bool got_lock = false;
-  for (int i = 0; i < 10; ++i) {
-    if (lock->TryLock()) {
-      got_lock = true;
-      break;
-    }
-    if (!waiting) break;
-    base::PlatformThread::Sleep(100 * i);
-  }
-  if (!got_lock) {
-    lock.reset();
-  }
-  return lock.release();
-}
-
 MultiProcessLock* TakeServiceInitializingLock(bool waiting) {
   std::string lock_name =
       GetServiceProcessScopedName("_service_initializing");
   return TakeNamedLock(lock_name, waiting);
 }
 
 std::string GetBaseDesktopName() {
 #if defined(GOOGLE_CHROME_BUILD)
   return "google-chrome-service.desktop";
 #else  // CHROMIUM_BUILD
@@ skipping 50 matching lines @@
       GetServiceProcessScopedName(GetBaseDesktopName()),
       app_name,
       autorun_command_line_->GetCommandLineString(),
       false);
 }
 
 bool ServiceProcessState::RemoveFromAutoRun() {
   return AutoStart::Remove(
       GetServiceProcessScopedName(GetBaseDesktopName()));
 }