commit 8d00ddcf29333859d20684cca51243e048ddc10e
author huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Mar 25 23:48:23 2010
committer huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Mar 25 23:48:23 2010
tree 23b7c018cb9bbc9afdc638a81fb401245dd74d50
parent 17fbcc851fffd1e04eb0343c6ba558e66fc0c3d0

Merge 40701 - Overinstall mismatch, Launch the existing chrome instead
 If the user has a systemlevel chrome and it is trying to install user level, instead of having omaha show an error, the existing system level install is launched with firstrun
 Disable toast experiment

BUG=37410
TEST=see bug

Review URL: http://codereview.chromium.org/668114

TBR=cpu@chromium.org
Review URL: http://codereview.chromium.org/1387002

git-svn-id: svn://svn.chromium.org/chrome/branches/342/src@42697 0039d316-1c4b-4281-b951-d872f2087c98