Index: chrome/installer/gcapi_mac/gcapi.mm |
diff --git a/chrome/installer/gcapi_mac/gcapi.mm b/chrome/installer/gcapi_mac/gcapi.mm |
index 798a53966f83776cdd58dd17497e1f12c7695a3d..25e0497c2e52347ea5005af8278c9f68e0ea7fa8 100644 |
--- a/chrome/installer/gcapi_mac/gcapi.mm |
+++ b/chrome/installer/gcapi_mac/gcapi.mm |
@@ -312,10 +312,6 @@ bool isbrandchar(int c) { |
int GoogleChromeCompatibilityCheck(unsigned* reasons) { |
unsigned local_reasons = 0; |
@autoreleasepool { |
- passwd* user = GetRealUserId(); |
- if (!user) |
- return GCCC_ERROR_ACCESSDENIED; |
- |
if (!IsOSXVersionSupported()) |
local_reasons |= GCCC_ERROR_OSNOTSUPPORTED; |
@@ -326,7 +322,10 @@ int GoogleChromeCompatibilityCheck(unsigned* reasons) { |
local_reasons |= GCCC_ERROR_ACCESSDENIED; |
} |
- if (FindChromeTicket(kUserTicket, user, NULL)) |
+ passwd* user = GetRealUserId(); |
+ if (!user) |
+ local_reasons |= GCCC_ERROR_ACCESSDENIED; |
+ else if (FindChromeTicket(kUserTicket, user, NULL)) |
local_reasons |= GCCC_ERROR_ALREADYPRESENT; |
if ([[NSFileManager defaultManager] fileExistsAtPath:kChromeInstallPath]) |
@@ -337,8 +336,8 @@ int GoogleChromeCompatibilityCheck(unsigned* reasons) { |
isWritableFileAtPath:@"/Applications"]) |
local_reasons |= GCCC_ERROR_ACCESSDENIED; |
} |
- |
} |
+ |
if (reasons != NULL) |
*reasons = local_reasons; |
return local_reasons == 0; |