diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-08 21:43:30 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-08 21:43:30 +0000 |
| commit | 7600d0b2d5e37b211280d5109a6b726644d6be76 (patch) | |
| tree | 4ba2cb5383bb9ef5f610aeffe5d4455149da683b /chrome/browser/extensions/extension_creator.cc | |
| parent | a4f7378f973b38400f133958842eb36db0b61dcb (diff) | |
| download | chromium_src-7600d0b2d5e37b211280d5109a6b726644d6be76.zip chromium_src-7600d0b2d5e37b211280d5109a6b726644d6be76.tar.gz chromium_src-7600d0b2d5e37b211280d5109a6b726644d6be76.tar.bz2 | |
Revert 239400 "Revert 239280 "Move more file_util functions to b..."
Broke all bots 9_9
> Revert 239280 "Move more file_util functions to base namespace."
>
> dbus_unittests started fialing on Linux Tests (dbg)(2) and Linux Tests (dbg)(2)(32).
> This CL is the only in the intersection of CLs in the first failing build on
> the two builders, so giving a speculative revert a try (rlarocque already
> tried a clobber, it didn't help).
>
> http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29/builds/41806
> http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29%2832%29/builds/8544
>
>
> > Move more file_util functions to base namespace.
> >
> > TBR=sky
> >
> > Review URL: https://codereview.chromium.org/109043002
>
> TBR=brettw@chromium.org
>
> Review URL: https://codereview.chromium.org/105823009
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/100923007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239401 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_creator.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_creator.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc index be9ac61..c31a399 100644 --- a/chrome/browser/extensions/extension_creator.cc +++ b/chrome/browser/extensions/extension_creator.cc @@ -213,7 +213,7 @@ bool ExtensionCreator::SignZip(const base::FilePath& zip_path, std::vector<uint8>* signature) { scoped_ptr<crypto::SignatureCreator> signature_creator( crypto::SignatureCreator::Create(private_key)); - ScopedStdioHandle zip_handle(file_util::OpenFile(zip_path, "rb")); + ScopedStdioHandle zip_handle(base::OpenFile(zip_path, "rb")); size_t buffer_size = 1 << 16; scoped_ptr<uint8[]> buffer(new uint8[buffer_size]); int bytes_read = -1; @@ -241,7 +241,7 @@ bool ExtensionCreator::WriteCRX(const base::FilePath& zip_path, const base::FilePath& crx_path) { if (base::PathExists(crx_path)) base::DeleteFile(crx_path, false); - ScopedStdioHandle crx_handle(file_util::OpenFile(crx_path, "wb")); + ScopedStdioHandle crx_handle(base::OpenFile(crx_path, "wb")); if (!crx_handle.get()) { error_message_ = l10n_util::GetStringUTF8(IDS_EXTENSION_SHARING_VIOLATION); return false; @@ -273,7 +273,7 @@ bool ExtensionCreator::WriteCRX(const base::FilePath& zip_path, size_t buffer_size = 1 << 16; scoped_ptr<uint8[]> buffer(new uint8[buffer_size]); size_t bytes_read = 0; - ScopedStdioHandle zip_handle(file_util::OpenFile(zip_path, "rb")); + ScopedStdioHandle zip_handle(base::OpenFile(zip_path, "rb")); while ((bytes_read = fread(buffer.get(), 1, buffer_size, zip_handle.get())) > 0) { if (fwrite(buffer.get(), sizeof(char), bytes_read, crx_handle.get()) != |