summaryrefslogtreecommitdiffstats
path: root/chrome/browser/process_singleton_linux_uitest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-13 14:37:38 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-13 14:37:38 +0000
commit4b59cf24ca1128e5b3f3b4fa8b585575d44222f7 (patch)
tree063ccb2187e2285260b309e284b2f2170b0240e4 /chrome/browser/process_singleton_linux_uitest.cc
parentfd7bdcc89b6483ebbfc4eaca6a7b0ba1fe1aca1b (diff)
downloadchromium_src-4b59cf24ca1128e5b3f3b4fa8b585575d44222f7.zip
chromium_src-4b59cf24ca1128e5b3f3b4fa8b585575d44222f7.tar.gz
chromium_src-4b59cf24ca1128e5b3f3b4fa8b585575d44222f7.tar.bz2
Make running chrome process detection in ui tests more reliable.
Also drops fragile code. TEST=Covered by ui_tests. BUG=10840 Review URL: http://codereview.chromium.org/545006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/process_singleton_linux_uitest.cc')
-rw-r--r--chrome/browser/process_singleton_linux_uitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/process_singleton_linux_uitest.cc b/chrome/browser/process_singleton_linux_uitest.cc
index f325e59..8bef102 100644
--- a/chrome/browser/process_singleton_linux_uitest.cc
+++ b/chrome/browser/process_singleton_linux_uitest.cc
@@ -102,7 +102,7 @@ TEST_F(ProcessSingletonLinuxTest, NotifyOtherProcessSuccess) {
// Test failure case of NotifyOtherProcess().
TEST_F(ProcessSingletonLinuxTest, NotifyOtherProcessFailure) {
- base::ProcessId pid = ChromeBrowserProcessId(user_data_dir());
+ base::ProcessId pid = browser_process_id();
ASSERT_GE(pid, 1);
@@ -139,7 +139,7 @@ TEST_F(ProcessSingletonLinuxTest, NotifyOtherProcessHostChanged) {
// Test that we fail when lock says process is on another host and we can't
// notify it over the socket.
TEST_F(ProcessSingletonLinuxTest, NotifyOtherProcessDifferingHost) {
- base::ProcessId pid = ChromeBrowserProcessId(user_data_dir());
+ base::ProcessId pid = browser_process_id();
ASSERT_GE(pid, 1);