Only set precache.last_time when precache ran.

components/precache/content/precache_manager.cc

 // Copyright 2013 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 "components/precache/content/precache_manager.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 42 matching lines @@
 
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
       base::Bind(base::IgnoreResult(&PrecacheDatabase::Init),
                  precache_database_, db_path));
 }
 
 PrecacheManager::~PrecacheManager() {}
 
 bool PrecacheManager::ShouldRun() const {
-  // Verify IsPrecachingAllowed() before calling IsPrecachingEnabled(). This is
+  // Verify PrecachingAllowed() before calling IsPrecachingEnabled(). This is
   // because field trials are only assigned when requested. This allows us to
   // create Control and Experiment groups that are limited to users for whom
-  // IsPrecachingAllowed() is true, thus accentuating the impact of precaching.
-  return IsPrecachingAllowed() && IsPrecachingEnabled();
+  // PrecachingAllowed() is true, thus accentuating the impact of precaching.
+  return PrecachingAllowed() == AllowedType::ALLOWED && IsPrecachingEnabled();
 }
 
 bool PrecacheManager::WouldRun() const {
-  return IsPrecachingAllowed();
+  return PrecachingAllowed() == AllowedType::ALLOWED;
 }
 
 // static
 bool PrecacheManager::IsPrecachingEnabled() {
   return base::FieldTrialList::FindFullName(kPrecacheFieldTrialName) ==
              kPrecacheFieldTrialEnabledGroup ||
          base::CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kEnablePrecache);
 }
 
-bool PrecacheManager::IsPrecachingAllowed() const {
+PrecacheManager::AllowedType PrecacheManager::PrecachingAllowed() const {
+  if (!(sync_service_ && sync_service_->backend_initialized()))
+    return AllowedType::PENDING;
+
   // SyncService delegates to SyncPrefs, which must be called on the UI thread.
-  return sync_service_ &&
-         sync_service_->GetActiveDataTypes().Has(syncer::SESSIONS) &&
-         !sync_service_->GetEncryptedDataTypes().Has(syncer::SESSIONS);
+  if (sync_service_->GetActiveDataTypes().Has(syncer::SESSIONS) &&
+      !sync_service_->GetEncryptedDataTypes().Has(syncer::SESSIONS))
+    return AllowedType::ALLOWED;
+
+  return AllowedType::DISALLOWED;
 }
 
 void PrecacheManager::StartPrecaching(
     const PrecacheCompletionCallback& precache_completion_callback,
     const history::HistoryService& history_service) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (is_precaching_) {
     DLOG(WARNING) << "Cannot start precaching because precaching is already "
                      "in progress.";
     return;
   }
-  is_precaching_ = true;
-
   precache_completion_callback_ = precache_completion_callback;
 
   if (ShouldRun()) {
+    is_precaching_ = true;
+
     BrowserThread::PostTask(
         BrowserThread::DB, FROM_HERE,
         base::Bind(&PrecacheDatabase::DeleteExpiredPrecacheHistory,
                    precache_database_, base::Time::Now()));
 
     // Request NumTopHosts() top hosts. Note that PrecacheFetcher is further
     // bound by the value of PrecacheConfigurationSettings.top_sites_count, as
     // retrieved from the server.
     history_service.TopHosts(
         NumTopHosts(),
         base::Bind(&PrecacheManager::OnHostsReceived, AsWeakPtr()));
   } else {
+    if (PrecachingAllowed() != AllowedType::PENDING) {
+      // We are not waiting on the sync backend to be initialized. The user
+      // either is not in the field trial, or does not have sync enabled.
+      // Pretend that precaching started, so that the PrecacheServiceLauncher
+      // doesn't try to start it again.
+      is_precaching_ = true;
+    }
+
     OnDone();
   }
 }
 
 void PrecacheManager::CancelPrecaching() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!is_precaching_) {
     // Do nothing if precaching is not in progress.
     return;
@@ skipping 54 matching lines @@
       base::Bind(&PrecacheDatabase::ClearHistory, precache_database_));
 }
 
 void PrecacheManager::Shutdown() {
   CancelPrecaching();
 }
 
 void PrecacheManager::OnDone() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  // If OnDone has been called, then we should just be finishing precaching.
-  DCHECK(is_precaching_);
-  is_precaching_ = false;
-
   precache_fetcher_.reset();
 
-  precache_completion_callback_.Run();
+  precache_completion_callback_.Run(!is_precaching_);
   // Uninitialize the callback so that any scoped_refptrs in it are released.
   precache_completion_callback_.Reset();
+
+  is_precaching_ = false;
 }
 
 void PrecacheManager::OnHostsReceived(
     const history::TopHostsList& host_counts) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!is_precaching_) {
     // Don't start precaching if it was canceled while waiting for the list of
     // hosts.
     return;
   }
 
   std::vector<std::string> hosts;
   for (const auto& host_count : host_counts)
     hosts.push_back(host_count.first);
 
   // Start precaching.
   precache_fetcher_.reset(
       new PrecacheFetcher(hosts, browser_context_->GetRequestContext(),
                           variations::GetVariationParamValue(
                               kPrecacheFieldTrialName, kManifestURLPrefixParam),
                           this));
   precache_fetcher_->Start();
 }
 
 }  // namespace precache