| Index: chrome/browser/process_singleton_mac_unittest.cc
|
| diff --git a/chrome/browser/process_singleton_mac_unittest.cc b/chrome/browser/process_singleton_mac_unittest.cc
|
| index 41dbdf267eacda1aa0f29f85b8807661c647fa0f..51312cdf28c4774ac35cc6a139a3c28fcbe07dc5 100644
|
| --- a/chrome/browser/process_singleton_mac_unittest.cc
|
| +++ b/chrome/browser/process_singleton_mac_unittest.cc
|
| @@ -69,7 +69,7 @@ class ProcessSingletonMacTest : public PlatformTest {
|
| TEST_F(ProcessSingletonMacTest, Basic) {
|
| ProcessSingleton ps(temp_dir_.path());
|
| EXPECT_FALSE(IsLocked());
|
| - EXPECT_TRUE(ps.Create());
|
| + EXPECT_TRUE(ps.Create(ProcessSingleton::NotificationCallback()));
|
| EXPECT_TRUE(IsLocked());
|
| ps.Cleanup();
|
| EXPECT_FALSE(IsLocked());
|
| @@ -80,7 +80,7 @@ TEST_F(ProcessSingletonMacTest, DestructorReleases) {
|
| EXPECT_FALSE(IsLocked());
|
| {
|
| ProcessSingleton ps(temp_dir_.path());
|
| - EXPECT_TRUE(ps.Create());
|
| + EXPECT_TRUE(ps.Create(ProcessSingleton::NotificationCallback()));
|
| EXPECT_TRUE(IsLocked());
|
| }
|
| EXPECT_FALSE(IsLocked());
|
| @@ -99,16 +99,16 @@ TEST_F(ProcessSingletonMacTest, Interlock) {
|
|
|
| // When |ps1| has the lock, |ps2| cannot get it.
|
| EXPECT_FALSE(IsLocked());
|
| - EXPECT_TRUE(ps1.Create());
|
| + EXPECT_TRUE(ps1.Create(ProcessSingleton::NotificationCallback()));
|
| EXPECT_TRUE(IsLocked());
|
| - EXPECT_FALSE(ps2.Create());
|
| + EXPECT_FALSE(ps2.Create(ProcessSingleton::NotificationCallback()));
|
| ps1.Cleanup();
|
|
|
| // And when |ps2| has the lock, |ps1| cannot get it.
|
| EXPECT_FALSE(IsLocked());
|
| - EXPECT_TRUE(ps2.Create());
|
| + EXPECT_TRUE(ps2.Create(ProcessSingleton::NotificationCallback()));
|
| EXPECT_TRUE(IsLocked());
|
| - EXPECT_FALSE(ps1.Create());
|
| + EXPECT_FALSE(ps1.Create(ProcessSingleton::NotificationCallback()));
|
| ps2.Cleanup();
|
| EXPECT_FALSE(IsLocked());
|
| }
|
| @@ -126,16 +126,24 @@ TEST_F(ProcessSingletonMacTest, NotifyOtherProcessOrCreate) {
|
|
|
| // When |ps1| has the lock, |ps2| cannot get it.
|
| EXPECT_FALSE(IsLocked());
|
| - EXPECT_EQ(ProcessSingleton::PROCESS_NONE, ps1.NotifyOtherProcessOrCreate());
|
| + EXPECT_EQ(
|
| + ProcessSingleton::PROCESS_NONE,
|
| + ps1.NotifyOtherProcessOrCreate(ProcessSingleton::NotificationCallback()));
|
| EXPECT_TRUE(IsLocked());
|
| - EXPECT_EQ(ProcessSingleton::PROFILE_IN_USE, ps2.NotifyOtherProcessOrCreate());
|
| + EXPECT_EQ(
|
| + ProcessSingleton::PROFILE_IN_USE,
|
| + ps2.NotifyOtherProcessOrCreate(ProcessSingleton::NotificationCallback()));
|
| ps1.Cleanup();
|
|
|
| // And when |ps2| has the lock, |ps1| cannot get it.
|
| EXPECT_FALSE(IsLocked());
|
| - EXPECT_EQ(ProcessSingleton::PROCESS_NONE, ps2.NotifyOtherProcessOrCreate());
|
| + EXPECT_EQ(
|
| + ProcessSingleton::PROCESS_NONE,
|
| + ps2.NotifyOtherProcessOrCreate(ProcessSingleton::NotificationCallback()));
|
| EXPECT_TRUE(IsLocked());
|
| - EXPECT_EQ(ProcessSingleton::PROFILE_IN_USE, ps1.NotifyOtherProcessOrCreate());
|
| + EXPECT_EQ(
|
| + ProcessSingleton::PROFILE_IN_USE,
|
| + ps1.NotifyOtherProcessOrCreate(ProcessSingleton::NotificationCallback()));
|
| ps2.Cleanup();
|
| EXPECT_FALSE(IsLocked());
|
| }
|
|
|