RFC: Add an interface for having the browser open a pnacl support file

chrome/browser/component_updater/pnacl/pnacl_component_installer.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 <string.h>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 144 matching lines @@
 
 bool PnaclComponentInstaller::Install(base::DictionaryValue* manifest,
                                       const FilePath& unpack_path) {
   Version version;
   if (!CheckPnaclComponentManifest(manifest, &version))
     return false;
   if (current_version_.CompareTo(version) > 0)
     return false;
 
   // Make sure that at least one of the compiler files exists.
-  if (!file_util::PathExists(unpack_path.Append(kPnaclCompilerFileName)))
+  if (!file_util::PathExists(
+          unpack_path.Append(kPnaclArch).Append(kPnaclCompilerFileName)))
     return false;
 
   // Passed the basic tests. Time to install it.
   FilePath path =
       GetPnaclBaseDirectory().AppendASCII(version.GetString());
   if (file_util::PathExists(path))
     return false;
   if (!file_util::Move(unpack_path, path))
     return false;
 
   // Installation is done. Now tell the rest of chrome (just the path service
   // for now). TODO(jvoung): we need notifications if someone surfed to a
   // Pnacl webpage and Pnacl was just installed at this time. They should
   // 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::FILE_PNACL_COMPONENT, path);
+  PathService::Override(chrome::DIR_PNACL_COMPONENT, path);
   return true;
 }
 
 namespace {
 
 // Finally, do the registration with the right version number.
 void FinishPnaclUpdateRegistration(ComponentUpdateService* cus,
                                    const Version& version) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   CrxComponent pnacl;
@@ skipping 19 matching lines @@
   }
 
   Version version(kNullVersion);
   if (GetLatestPnaclDirectory(&path, &version)) {
     // Check if one of the Pnacl files is really there.
     FilePath compiler_path = path.Append(kPnaclCompilerFileName);
     if (!file_util::PathExists(compiler_path)) {
       version = Version(kNullVersion);
     } else {
       // Register the existing path for now, before checking for updates.
-      // TODO(jvoung): Will this always happen "early" or will it
-      // race with the NaCl plugin in browser tests?
-      PathService::Override(chrome::FILE_PNACL_COMPONENT, path);
+      PathService::Override(chrome::DIR_PNACL_COMPONENT, path);
     }
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&FinishPnaclUpdateRegistration, cus, version));
 }
 
 }  // namespace
 
 void RegisterPnaclComponent(ComponentUpdateService* cus) {
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&StartPnaclUpdateRegistration, cus));
 }