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

Unified Diff: extensions/browser/content_verifier_io_data.cc

Issue 630243002: Fix extension content verification handling of ./ in icon paths (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added copyright headers to .js files to fix presubmit error Created 6 years, 2 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
« no previous file with comments | « extensions/browser/content_verifier_io_data.h ('k') | extensions/browser/content_verify_job.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/content_verifier_io_data.cc
diff --git a/extensions/browser/content_verifier_io_data.cc b/extensions/browser/content_verifier_io_data.cc
index e7974887b1883b6aa6e0f6dca3c4415160998d21..102c95b40135f41534996fefa3920ea1d42323ff 100644
--- a/extensions/browser/content_verifier_io_data.cc
+++ b/extensions/browser/content_verifier_io_data.cc
@@ -9,9 +9,9 @@
namespace extensions {
ContentVerifierIOData::ExtensionData::ExtensionData(
- const std::set<base::FilePath>& browser_image_paths,
+ scoped_ptr<std::set<base::FilePath>> browser_image_paths,
const base::Version& version) {
- this->browser_image_paths = browser_image_paths;
+ this->browser_image_paths = browser_image_paths.Pass();
this->version = version;
}
@@ -27,6 +27,7 @@ ContentVerifierIOData::~ContentVerifierIOData() {
void ContentVerifierIOData::AddData(const std::string& extension_id,
scoped_ptr<ExtensionData> data) {
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+ CHECK(data->browser_image_paths.get());
data_map_[extension_id] = linked_ptr<ExtensionData>(data.release());
}
« no previous file with comments | « extensions/browser/content_verifier_io_data.h ('k') | extensions/browser/content_verify_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698