Attempt to repair corrupt enterprise policy force-installed extensions

extensions/browser/updater/manifest_fetch_data.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef EXTENSIONS_BROWSER_UPDATER_MANIFEST_FETCH_DATA_H_
 #define EXTENSIONS_BROWSER_UPDATER_MANIFEST_FETCH_DATA_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 52 matching lines @@
           active_days(0),
           is_enabled(true),
           disable_reasons(0) {}
     PingData(int rollcall, int active, bool enabled, int reasons)
         : rollcall_days(rollcall),
           active_days(active),
           is_enabled(enabled),
           disable_reasons(reasons) {}
   };
 
+  // A variety of parameters for special cases that aren't used for most
+  // requests.
+  struct ExtraParams {
+    // Additional data to be passed up in the update request.
+    std::string update_url_data;
+
+    // Indicates whether this is a policy force-installed extension that we're
+    // reinstalling due to corruption being detected in it.

[lazyboy, 2016/09/02 19:21:53]

s/detected in it/detected in the extension
as this is harder to guess whether the policy itself corrupted or the extension
did.

[asargent_no_longer_on_chrome, 2016/09/09 03:30:44]

Comment simplified (Note that this struct moved to extension_downloader.h)

+    bool is_corrupt_policy_reinstall;

[lazyboy, 2016/09/02 19:21:53]

(again feel free to suggest something better)
in order to clear the confusion i mentioned above, maybe sth like:
is_policy_reinstall_due_to_corrupt_extension or something that disambiguates
which of policy or extension is corrupt.

[asargent_no_longer_on_chrome, 2016/09/09 03:30:44]

This moved to extension_downloader.h, and I changed this member's name to
"is_corrupt_reinstall" to match the variable usage there. 

+
+    ExtraParams();
+  };
+
   ManifestFetchData(const GURL& update_url,
                     int request_id,
                     const std::string& brand_code,
                     const std::string& base_query_params,
                     PingMode ping_mode);
   ~ManifestFetchData();
 
   // Returns true if this extension information was successfully added. If the
   // return value is false it means the full_url would have become too long, and
   // this ManifestFetchData object remains unchanged.
   bool AddExtension(const std::string& id,
                     const std::string& version,
                     const PingData* ping_data,
-                    const std::string& update_url_data,
-                    const std::string& install_source);
+                    const std::string& install_source,
+                    const ExtraParams* extra_params);
 
   const GURL& base_url() const { return base_url_; }
   const GURL& full_url() const { return full_url_; }
   const std::set<std::string>& extension_ids() const { return extension_ids_; }
   const std::set<int>& request_ids() const { return request_ids_; }
 
   // Returns true if the given id is included in this manifest fetch.
   bool Includes(const std::string& extension_id) const;
 
   // Returns true if a ping parameter for |type| was added to full_url for this
@@ skipping 33 matching lines @@
   // The ping mode for this fetch. This determines whether or not ping data
   // (and possibly extra metrics) will be included in the fetch query.
   const PingMode ping_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(ManifestFetchData);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_UPDATER_MANIFEST_FETCH_DATA_H_