Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1015)

Unified Diff: chrome/browser/component_updater/component_unpacker.cc

Issue 324773002: Remove base/memory/scoped_handle.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/component_updater/component_unpacker.cc
diff --git a/chrome/browser/component_updater/component_unpacker.cc b/chrome/browser/component_updater/component_unpacker.cc
index ed7bf1fc02a9d3bb3e0f0ec0e3748a2a93eb97e0..74b17853bacf6890421a15b6ae0302ac5ea9d0b0 100644
--- a/chrome/browser/component_updater/component_unpacker.cc
+++ b/chrome/browser/component_updater/component_unpacker.cc
@@ -10,10 +10,10 @@
#include "base/bind.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
+#include "base/files/scoped_file.h"
#include "base/json/json_file_value_serializer.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/memory/scoped_handle.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
@@ -152,13 +152,13 @@ bool ComponentUnpacker::Verify() {
}
// First, validate the CRX header and signature. As of today
// this is SHA1 with RSA 1024.
- ScopedStdioHandle file(base::OpenFile(path_, "rb"));
+ base::ScopedFILE file(base::OpenFile(path_, "rb"));
if (!file.get()) {
error_ = kInvalidFile;
return false;
}
CRXValidator validator(file.get());
- file.Close();
+ file.reset();
if (!validator.valid()) {
error_ = kInvalidFile;
return false;

Powered by Google App Engine
This is Rietveld 408576698