Merge codereview.chromium.org/630243002 onto 2171 branch

extensions/browser/content_verifier_io_data.cc

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());
 }