Add an API to component_updater that asks to do an update check "now".

chrome/browser/component_updater/pnacl/pnacl_component_installer.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/component_updater/pnacl/pnacl_component_installer.h"
 
 #include "base/base_paths.h"
 #include "base/bind.h"
+#include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "base/win/windows_version.h"
 #include "build/build_config.h"
 #include "chrome/browser/component_updater/component_updater_service.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace {
 
+// If PNaCl isn't installed yet, but a user is running chrome with
+// --enable-pnacl, this is the amount of time to wait before starting
+// a background install.
+const int kInitialDelaySeconds = 10;
+
 // One of the Pnacl component files, for checking that expected files exist.
 // TODO(jvoung): perhaps replace this with a list of the expected files in the
 // manifest.json. Use that to check that everything is unpacked.
 // However, that would make startup detection even slower (need to check for
 // more than one file!).
 const char kPnaclCompilerFileName[] = "llc_nexe";
 
 // Name of the Pnacl component specified in the manifest.
 const char kPnaclManifestNamePrefix[] = "PNaCl";
 
@@ skipping 82 matching lines @@
 
   component->pk_hash.assign(mips32_sha256_hash,
                             &mips32_sha256_hash[sizeof(mips32_sha256_hash)]);
 #else
 #error "Add support for your architecture to Pnacl Component Installer."
 #endif
 }
 
 
 // If we don't have Pnacl installed, this is the version we claim.
-// TODO(jvoung): Is there a way to trick the configurator to ping the server
-// earlier if there are components that are not yet installed (version 0.0.0.0),
-// So that they will be available ASAP? Be careful not to hurt startup speed.
-// Make kNullVersion part of ComponentUpdater in that case, to avoid skew?
 const char kNullVersion[] = "0.0.0.0";
 
 // Pnacl components have the version encoded in the path itself:
 // <profile>\AppData\Local\Google\Chrome\User Data\Pnacl\0.1.2.3\.
 // and the base directory will be:
 // <profile>\AppData\Local\Google\Chrome\User Data\Pnacl\.
 base::FilePath GetPnaclBaseDirectory() {
   base::FilePath result;
   CHECK(PathService::Get(chrome::DIR_PNACL_BASE, &result));
   return result;
@@ skipping 164 matching lines @@
   // then be able to reload the page and retry (or something).
   // See: http://code.google.com/p/chromium/issues/detail?id=107438
   current_version_ = version;
 
   PathService::Override(chrome::DIR_PNACL_COMPONENT, path);
   return true;
 }
 
 namespace {
 
+void DoCheckForUpdate(ComponentUpdateService* cus,
+                   const CrxComponent& pnacl) {
+  if (cus->CheckForUpdateSoon(pnacl) != ComponentUpdateService::kOk) {
+    LOG(WARNING) << "Pnacl check for update failed.";
+  }
+}
+
 // Finally, do the registration with the right version number.
 void FinishPnaclUpdateRegistration(ComponentUpdateService* cus,
                                    const Version& current_version) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Note: the source is the default of BANDAID, even though the
   // crxes are hosted from CWS.
   CrxComponent pnacl;
   pnacl.name = "pnacl";
   pnacl.installer = new PnaclComponentInstaller(current_version);
   pnacl.version = current_version;
   SetPnaclHash(&pnacl);
   if (cus->RegisterComponent(pnacl) != ComponentUpdateService::kOk) {
     NOTREACHED() << "Pnacl component registration failed.";
   }
+
+  // If PNaCl is not yet installed but it is requested by --enable-pnacl,
+  // we want it to be available "soon", so kick off an update check
+  // earlier than usual.
+  Version null_version(kNullVersion);
+  if (current_version.Equals(null_version)) {
+    BrowserThread::PostDelayedTask(
+        BrowserThread::UI, FROM_HERE,
+        base::Bind(DoCheckForUpdate, cus, pnacl),
+        base::TimeDelta::FromSeconds(kInitialDelaySeconds));
+  }
 }
 
 // Check if there is an existing version on disk first to know when
 // a hosted version is actually newer.
 void StartPnaclUpdateRegistration(ComponentUpdateService* cus) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   base::FilePath path = GetPnaclBaseDirectory();
   if (!file_util::PathExists(path)) {
     if (!file_util::CreateDirectory(path)) {
       NOTREACHED() << "Could not create base Pnacl directory.";
@@ skipping 17 matching lines @@
 
   // Remove older versions of PNaCl.
   for (std::vector<base::FilePath>::iterator iter = older_dirs.begin();
        iter != older_dirs.end(); ++iter) {
     file_util::Delete(*iter, true);
   }
 }
 
 }  // namespace
 
-void RegisterPnaclComponent(ComponentUpdateService* cus) {
-  BrowserThread::PostTask(
-      BrowserThread::FILE, FROM_HERE,
-      base::Bind(&StartPnaclUpdateRegistration, cus));
+void RegisterPnaclComponent(ComponentUpdateService* cus,
+                            const CommandLine& command_line) {
+  // Only register when given the right flag.  This is important since
+  // we do an early component updater check above (in DoCheckForUpdate).
+  if (command_line.HasSwitch(switches::kEnablePnacl)) {
+    BrowserThread::PostTask(
+        BrowserThread::FILE, FROM_HERE,
+        base::Bind(&StartPnaclUpdateRegistration, cus));
+  }
 }