commit 7e635ce31579a3f820c48112e60d58d35a20b2d3
author lazyboy <lazyboy@chromium.org> Mon Mar 20 20:16:57 2017
committer Commit bot <commit-bot@chromium.org> Mon Mar 20 20:16:57 2017
tree f40fe4049a92354fdba7bed868780d48566cc931
parent fb22f88512765b36c74766d5766e443cc3202b1a

Remove ContentHashReader::verified_contents_

Use a local variable instead where it is necessary.

BUG=None
Test=None, internal cleanup.

Review-Url: https://codereview.chromium.org/2762453002
Cr-Commit-Position: refs/heads/master@{#458163}

extensions/browser/content_hash_reader.cc

diff --git a/extensions/browser/content_hash_reader.cc b/extensions/browser/content_hash_reader.cc
index 66e7211eb..c7a99c0 100644
--- a/extensions/browser/content_hash_reader.cc
+++ b/extensions/browser/content_hash_reader.cc
@@ -61,12 +61,13 @@
   if (!base::PathExists(verified_contents_path))
     return false;
 
-  verified_contents_.reset(new VerifiedContents(key_.data, key_.size));
-  if (!verified_contents_->InitFrom(verified_contents_path) ||
-      !verified_contents_->valid_signature() ||
-      verified_contents_->version() != extension_version_ ||
-      verified_contents_->extension_id() != extension_id_)
+  VerifiedContents verified_contents(key_.data, key_.size);
+  if (!verified_contents.InitFrom(verified_contents_path) ||
+      !verified_contents.valid_signature() ||
+      verified_contents.version() != extension_version_ ||
+      verified_contents.extension_id() != extension_id_) {
     return false;
+  }
 
   have_verified_contents_ = true;
 
@@ -87,7 +88,7 @@
 
   std::string root =
       ComputeTreeHashRoot(hashes_, block_size_ / crypto::kSHA256Length);
-  if (!verified_contents_->TreeHashRootEquals(relative_path_, root))
+  if (!verified_contents.TreeHashRootEquals(relative_path_, root))
     return false;
 
   status_ = SUCCESS;