Merge 40701 - Overinstall mismatch, Launch the existing chrome instead...

chrome/installer/util/google_chrome_distribution.cc

Index: chrome/installer/util/google_chrome_distribution.cc
===================================================================
--- chrome/installer/util/google_chrome_distribution.cc	(revision 42695)
+++ chrome/installer/util/google_chrome_distribution.cc	(working copy)
@@ -513,7 +513,8 @@
     // Check browser usage inactivity by the age of the last-write time of the
     // chrome user data directory.
     std::wstring user_data_dir = installer::GetChromeUserDataPath();
-    const int kThirtyDays = 30 * 24;
+    // TODO(cpu): re-enable experiment.
+    const int kThirtyDays = 3000 * 24;
     int dir_age_hours = GetDirectoryWriteAgeInHours(user_data_dir.c_str());
     if (dir_age_hours < 0) {
       // This means that we failed to find the user data dir. The most likey