Merge codereview.chromium.org/630243002 onto 2171 branch

extensions/browser/content_verifier_io_data.h

Index: extensions/browser/content_verifier_io_data.h
diff --git a/extensions/browser/content_verifier_io_data.h b/extensions/browser/content_verifier_io_data.h
index 64596f51a3690442dbd7d7a3f758a5edd684c905..92e8248b8ca07376305cebd67e3e319a587aab6f 100644
--- a/extensions/browser/content_verifier_io_data.h
+++ b/extensions/browser/content_verifier_io_data.h
@@ -23,10 +23,10 @@ class ContentVerifierIOData
     : public base::RefCountedThreadSafe<ContentVerifierIOData> {
  public:
   struct ExtensionData {
-    std::set<base::FilePath> browser_image_paths;
+    scoped_ptr<std::set<base::FilePath>> browser_image_paths;
     base::Version version;
 
-    ExtensionData(const std::set<base::FilePath>& browser_image_paths,
+    ExtensionData(scoped_ptr<std::set<base::FilePath>> browser_image_paths,
                   const base::Version& version);
     ~ExtensionData();
   };