diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 17:02:14 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 17:02:14 +0000 |
| commit | 85df9d101984f35299f192f9ef072fc6ee002e58 (patch) | |
| tree | 8550c702f1859f4845036e3d4e557c9ab7e9a57e /chrome/utility/extensions | |
| parent | 2ab05a9e3446531509897ce836e0770e74b37232 (diff) | |
| download | chromium_src-85df9d101984f35299f192f9ef072fc6ee002e58.zip chromium_src-85df9d101984f35299f192f9ef072fc6ee002e58.tar.gz chromium_src-85df9d101984f35299f192f9ef072fc6ee002e58.tar.bz2 | |
Move most of extension_file_util.cc into extensions/common/file_util.cc
This allows file_util::LoadExtension to be used from app_shell.
Also added a trivial unit test for the one function remaining in
extension_file_util.
BUG=362752
TEST=unit_tests, added GetBrowserImagePaths
TBR=stevenjb@chromium.org for mechanical header file renames touching c/b/chromeos
Review URL: https://codereview.chromium.org/236213002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/utility/extensions')
| -rw-r--r-- | chrome/utility/extensions/unpacker.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/utility/extensions/unpacker.cc b/chrome/utility/extensions/unpacker.cc index 4a14987..c2ccb0d 100644 --- a/chrome/utility/extensions/unpacker.cc +++ b/chrome/utility/extensions/unpacker.cc @@ -25,6 +25,7 @@ #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_l10n_util.h" +#include "extensions/common/file_util.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "grit/generated_resources.h" @@ -202,8 +203,7 @@ bool Unpacker::Run() { } std::vector<InstallWarning> warnings; - if (!extension_file_util::ValidateExtension(extension.get(), - &error, &warnings)) { + if (!file_util::ValidateExtension(extension.get(), &error, &warnings)) { SetError(error); return false; } |