Attempt to repair corrupt enterprise policy force-installed extensions

extensions/browser/updater/manifest_fetch_data.cc

 // 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.
 
 #include "extensions/browser/updater/manifest_fetch_data.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 19 matching lines @@
     for (int enum_value = 1; enum_value < Extension::DISABLE_REASON_LAST;
          enum_value <<= 1) {
       if (ping_data->disable_reasons & enum_value)
         *ping_value += "&dr=" + base::IntToString(enum_value);
     }
   }
 }
 
 }  // namespace
 
+ManifestFetchData::ExtraParams::ExtraParams()
+    : is_corrupt_policy_reinstall(false) {}
+
 ManifestFetchData::ManifestFetchData(const GURL& update_url,
                                      int request_id,
                                      const std::string& brand_code,
                                      const std::string& base_query_params,
                                      PingMode ping_mode)
     : base_url_(update_url),
       full_url_(update_url),
       brand_code_(brand_code),
       ping_mode_(ping_mode) {
   std::string query =
@@ skipping 27 matching lines @@
 //   Extension 1- id:aaaa version:1.1
 //   Extension 2- id:bbbb version:2.0
 //
 // the full update url would be:
 //   http://somehost/path?x=id%3Daaaa%26v%3D1.1%26uc&x=id%3Dbbbb%26v%3D2.0%26uc
 //
 // (Note that '=' is %3D and '&' is %26 when urlencoded.)
 bool ManifestFetchData::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) {
   if (extension_ids_.find(id) != extension_ids_.end()) {
     NOTREACHED() << "Duplicate extension id " << id;
     return false;
   }
 
   // Compute the string we'd append onto the full_url_, and see if it fits.
   std::vector<std::string> parts;
   parts.push_back("id=" + id);
   parts.push_back("v=" + version);
   if (!install_source.empty())
     parts.push_back("installsource=" + install_source);
   parts.push_back("uc");
 
-  if (!update_url_data.empty()) {
+  if (extra_params && !extra_params->update_url_data.empty()) {
     // Make sure the update_url_data string is escaped before using it so that
     // there is no chance of overriding the id or v other parameter value
     // we place into the x= value.
-    parts.push_back("ap=" + net::EscapeQueryParamValue(update_url_data, true));
+    parts.push_back("ap=" + net::EscapeQueryParamValue(
+                                extra_params->update_url_data, true));
   }
+  if (extra_params && extra_params->is_corrupt_policy_reinstall)
+    parts.push_back("cpr");

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

We should update the this function's documentation.

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

(changes in this file have been reverted, since we changed to using the
installsource which we already had a way to customize)

 
   // Append brand code, rollcall and active ping parameters.
   if (ping_mode_ != NO_PING) {
     if (!brand_code_.empty())
       parts.push_back(base::StringPrintf("brand=%s", brand_code_.c_str()));
 
     std::string ping_value;
     pings_[id] = PingData(0, 0, false, 0);
     if (ping_data) {
       if (ping_data->rollcall_days == kNeverPinged ||
@@ skipping 52 matching lines @@
     NOTREACHED();
   return value == kNeverPinged || value > 0;
 }
 
 void ManifestFetchData::Merge(const ManifestFetchData& other) {
   DCHECK(full_url() == other.full_url());
   request_ids_.insert(other.request_ids_.begin(), other.request_ids_.end());
 }
 
 }  // namespace extensions