Reliably install default apps into new installations.

chrome/browser/extensions/default_apps.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/default_apps.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/browser_process.h"
+#if !defined(OS_ANDROID)
 #include "chrome/browser/first_run/first_run.h"
+#endif
 #include "chrome/browser/extensions/default_apps_trial.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
@@ skipping 47 matching lines @@
       profile_->GetPrefs()->GetString(prefs::kDefaultApps) == "install";
 
   InstallState state =
       static_cast<InstallState>(profile_->GetPrefs()->GetInteger(
           prefs::kDefaultAppsInstallState));
 
   is_migration_ = (state == kProvideLegacyDefaultApps);
 
   switch (state) {
     case kUnknown: {
-      // This is the first time the default apps feature runs on this profile.
-      // Determine if we want to install them or not.
+      // Only new installations and profiles get default apps. In theory the
+      // new profile checks should catch new installations, but that is not
+      // always the case (http:/crbug.com/145351).
       chrome::VersionInfo version_info;
-      if (!profile_->WasCreatedByVersionOrLater(version_info.Version().c_str()))
+      bool is_new_profile =
+          profile_->WasCreatedByVersionOrLater(version_info.Version().c_str());
+      // Android excludes most of the first run code, so it can't determine
+      // if this is a first run. That's OK though, because Android doesn't
+      // use default apps in general.
+#if defined(OS_ANDROID)
+      bool is_first_run = false;
+#else
+      bool is_first_run = first_run::IsChromeFirstRun();
+#endif
+      if (!is_first_run && !is_new_profile)
         install_apps = false;
       break;
     }
 
     // The old default apps were provided as external extensions and were
     // installed everytime Chrome was run. Thus, changing the list of default
     // apps affected all users. Migrate old default apps to new mechanism where
     // they are installed only once as INTERNAL.
     // TODO(grv) : remove after Q1-2013.
     case kProvideLegacyDefaultApps:
@@ skipping 76 matching lines @@
     for (std::set<std::string>::iterator it = new_default_apps.begin();
          it != new_default_apps.end(); ++it) {
       prefs->Remove(*it, NULL);
     }
   }
 
   ExternalProviderImpl::SetPrefs(prefs);
 }
 
 }  // namespace default_apps