Extract locking behaviour from ProcessSingleton.

This refactoring continues the division of the behaviour of ProcessSingleton into two parts:
* The protocol for establishing a server process and communicating between the client and server.
* How the server processes command-line invocations.

Very small behavioural change:
* If an error occurs while parsing the command-line received via COPY_DATA, the modal dialog (if any) is no longer flashed and raised to foreground.

The motivation for this change is that I wish to introduce some more sophisticated behaviour when queuing messages during startup. See the follow-up CL (in-progress) at https://codereview.chromium.org/12674028/ .

BUG=170726,170734,225693

Review URL: https://chromiumcodereview.appspot.com/12096114

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195264 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 127 deletions

diff --git a/chrome/browser/process_singleton_win_unittest.cc b/chrome/browser/process_singleton_win_unittest.cc
deleted file mode 100644
index 6484de1..0000000
--- a/chrome/browser/process_singleton_win_unittest.cc
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) 2013 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/browser/process_singleton.h"
-
-#include "base/bind.h"
-#include "base/command_line.h"
-#include "base/compiler_specific.h"
-#include "base/files/file_path.h"
-#include "base/files/scoped_temp_dir.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace {
-
-bool ServerCallback(int* callback_count,
-                    const CommandLine& command_line,
-                    const base::FilePath& current_directory) {
-  ++(*callback_count);
-  return true;
-}
-
-bool ClientCallback(const CommandLine& command_line,
-                    const base::FilePath& current_directory) {
-  ADD_FAILURE();
-  return false;
-}
-
-}  // namespace
-
-TEST(ProcessSingletonWinTest, Basic) {
-  base::ScopedTempDir profile_dir;
-  ASSERT_TRUE(profile_dir.CreateUniqueTempDir());
-
-  int callback_count = 0;
-
-  ProcessSingleton ps1(
-      profile_dir.path(),
-      base::Bind(&ServerCallback, base::Unretained(&callback_count)));
-  ProcessSingleton ps2(profile_dir.path(), base::Bind(&ClientCallback));
-
-  ProcessSingleton::NotifyResult result = ps1.NotifyOtherProcessOrCreate();
-
-  ASSERT_EQ(ProcessSingleton::PROCESS_NONE, result);
-  ASSERT_EQ(0, callback_count);
-
-  result = ps2.NotifyOtherProcessOrCreate();
-  ASSERT_EQ(ProcessSingleton::PROCESS_NOTIFIED, result);
-
-  ASSERT_EQ(1, callback_count);
-}
-
-#if !defined(USE_AURA)
-TEST(ProcessSingletonWinTest, Lock) {
-  base::ScopedTempDir profile_dir;
-  ASSERT_TRUE(profile_dir.CreateUniqueTempDir());
-
-  int callback_count = 0;
-
-  ProcessSingleton ps1(
-      profile_dir.path(),
-      base::Bind(&ServerCallback, base::Unretained(&callback_count)));
-  ps1.Lock(NULL);
-
-  ProcessSingleton ps2(profile_dir.path(), base::Bind(&ClientCallback));
-
-  ProcessSingleton::NotifyResult result = ps1.NotifyOtherProcessOrCreate();
-
-  ASSERT_EQ(ProcessSingleton::PROCESS_NONE, result);
-  ASSERT_EQ(0, callback_count);
-
-  result = ps2.NotifyOtherProcessOrCreate();
-  ASSERT_EQ(ProcessSingleton::PROCESS_NOTIFIED, result);
-
-  ASSERT_EQ(0, callback_count);
-  ps1.Unlock();
-  ASSERT_EQ(1, callback_count);
-}
-
-class TestableProcessSingleton : public ProcessSingleton {
- public:
-  TestableProcessSingleton(const base::FilePath& user_data_dir,
-                           const NotificationCallback& notification_callback)
-      : ProcessSingleton(user_data_dir, notification_callback),
-        called_set_foreground_window_(false) {}
-
-  bool called_set_foreground_window() { return called_set_foreground_window_; }
-
- protected:
-  virtual void DoSetForegroundWindow(HWND target_window) OVERRIDE {
-    called_set_foreground_window_ = true;
-  }
-
- private:
-  bool called_set_foreground_window_;
-};
-
-TEST(ProcessSingletonWinTest, LockWithModalDialog) {
-  base::ScopedTempDir profile_dir;
-  ASSERT_TRUE(profile_dir.CreateUniqueTempDir());
-
-  int callback_count = 0;
-
-  TestableProcessSingleton ps1(
-      profile_dir.path(),
-      base::Bind(&ServerCallback, base::Unretained(&callback_count)));
-  ps1.Lock(::GetShellWindow());
-
-  ProcessSingleton ps2(profile_dir.path(), base::Bind(&ClientCallback));
-
-  ProcessSingleton::NotifyResult result = ps1.NotifyOtherProcessOrCreate();
-
-  ASSERT_EQ(ProcessSingleton::PROCESS_NONE, result);
-  ASSERT_EQ(0, callback_count);
-
-  ASSERT_FALSE(ps1.called_set_foreground_window());
-  result = ps2.NotifyOtherProcessOrCreate();
-  ASSERT_EQ(ProcessSingleton::PROCESS_NOTIFIED, result);
-  ASSERT_TRUE(ps1.called_set_foreground_window());
-
-  ASSERT_EQ(0, callback_count);
-  ps1.Unlock();
-  // When a modal dialog is present, the new command-line invocation is silently
-  // dropped.
-  ASSERT_EQ(0, callback_count);
-}
-#endif  // !defined(USE_AURA)