| Index: chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
|
| diff --git a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
|
| index 7d1d35f83c851538560d1f6741b7021e1cb832f4..a4c06436bda69a2ef1bd9cab82ad0bb9eb5e2b53 100644
|
| --- a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
|
| +++ b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
|
| @@ -1,4 +1,4 @@
|
| -// 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.
|
|
|
| @@ -163,7 +163,8 @@ bool PnaclComponentInstaller::Install(base::DictionaryValue* manifest,
|
| 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.
|
| @@ -181,7 +182,7 @@ bool PnaclComponentInstaller::Install(base::DictionaryValue* manifest,
|
| // 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;
|
| }
|
|
|
| @@ -221,9 +222,7 @@ void StartPnaclUpdateRegistration(ComponentUpdateService* cus) {
|
| 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);
|
| }
|
| }
|
|
|
|
|