Reworked Avi's patch for master prefs implemented on mac to work with new fir...

Reworked Avi's patch for master prefs implemented on mac (http://codereview.chromium.org/2903014/show), so that it will work with new first run sequence on Windows and Mac.

BUG=44901
TEST=in bug


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=57099

[Avi (use Gerrit), 2010-08-16 18:35:56]

http://codereview.chromium.org/3148001/diff/1/7
File chrome/chrome_installer_util.gypi (right):

http://codereview.chromium.org/3148001/diff/1/7#newcode130
chrome/chrome_installer_util.gypi:130: ['OS=="linux" or OS=="freebsd" or
OS=="openbsd" or OS=="mac"', {
This is what I did, but now that I think about it, can we do just OS="win" and
OS!="win" for this?

[Miranda Callahan, 2010-08-16 18:40:35]

On 2010/08/16 18:35:56, Avi wrote:
> http://codereview.chromium.org/3148001/diff/1/7
> File chrome/chrome_installer_util.gypi (right):
> 
> http://codereview.chromium.org/3148001/diff/1/7#newcode130
> chrome/chrome_installer_util.gypi:130: ['OS=="linux" or OS=="freebsd" or
> OS=="openbsd" or OS=="mac"', {
> This is what I did, but now that I think about it, can we do just OS="win" and
> OS!="win" for this?

Yes, I think that makes sense -- will make the change.  Btw, I put this on the
back burner for the moment because I still need to fix a couple of bugs in M6,
and they conflict with this patch pretty seriously -- also, Nico is away until
Thursday (his changes will incorporate this patch).  These bugs should be closed
in the next couple days (if the tree ever opens again), at which time I'll land
this guy.

[Miranda Callahan, 2010-08-20 17:48:49]

Avi, this is ready for review.

http://codereview.chromium.org/3148001/diff/1/7
File chrome/chrome_installer_util.gypi (right):

http://codereview.chromium.org/3148001/diff/1/7#newcode130
chrome/chrome_installer_util.gypi:130: ['OS=="linux" or OS=="freebsd" or
OS=="openbsd" or OS=="mac"', {
On 2010/08/16 18:35:56, Avi wrote:
> This is what I did, but now that I think about it, can we do just OS="win" and
> OS!="win" for this?

Done.

[Avi (use Gerrit), 2010-08-20 18:35:38]

LGTM