Revert 207805 "Differential updates for components. We are addin..."

trunk/src/chrome/common/extensions/update_manifest.cc

 // Copyright (c) 2012 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 "chrome/common/extensions/update_manifest.h"
 
 #include <algorithm>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/version.h"
 #include "libxml/tree.h"
 #include "third_party/libxml/chromium/libxml_utils.h"
 
 static const char* kExpectedGupdateProtocol = "2.0";
 static const char* kExpectedGupdateXmlns =
     "http://www.google.com/update2/response";
 
-UpdateManifest::Result::Result()
-    : size(0),
-      diff_size(0) {}
+UpdateManifest::Result::Result() {}
 
 UpdateManifest::Result::~Result() {}
 
 UpdateManifest::Results::Results() : daystart_elapsed_seconds(kNoDaystart) {}
 
 UpdateManifest::Results::~Results() {}
 
 UpdateManifest::UpdateManifest() {
 }
 
@@ skipping 114 matching lines @@
   xmlNode *updatecheck = updates[0];
 
   if (GetAttribute(updatecheck, "status") == "noupdate") {
     return true;
   }
 
   // Find the url to the crx file.
   result->crx_url = GURL(GetAttribute(updatecheck, "codebase"));
   if (!result->crx_url.is_valid()) {
     *error_detail = "Invalid codebase url: '";
-    *error_detail += result->crx_url.possibly_invalid_spec();
+    *error_detail += GetAttribute(updatecheck, "codebase");
     *error_detail += "'.";
     return false;
   }
 
   // Get the version.
   result->version = GetAttribute(updatecheck, "version");
   if (result->version.length() == 0) {
     *error_detail = "Missing version for updatecheck.";
     return false;
   }
@@ skipping 14 matching lines @@
       *error_detail += result->browser_min_version;
       *error_detail += "'.";
       return false;
     }
   }
 
   // package_hash is optional. It is only required for blacklist. It is a
   // sha256 hash of the package in hex format.
   result->package_hash = GetAttribute(updatecheck, "hash");
 
-  int size = 0;
-  if (base::StringToInt(GetAttribute(updatecheck, "size"), &size)) {
-    result->size = size;
-  }
-
-  // package_fingerprint is optional. It identifies the package, preferably
-  // with a modified sha256 hash of the package in hex format.
-  result->package_fingerprint = GetAttribute(updatecheck, "fp");
-
-  // Differential update information is optional.
-  result->diff_crx_url = GURL(GetAttribute(updatecheck, "codebasediff"));
-  result->diff_package_hash = GetAttribute(updatecheck, "hashdiff");
-  int sizediff = 0;
-  if (base::StringToInt(GetAttribute(updatecheck, "sizediff"), &sizediff)) {
-    result->diff_size = sizediff;
-  }
-
   return true;
 }
 
 
 bool UpdateManifest::Parse(const std::string& manifest_xml) {
   results_.list.resize(0);
   results_.daystart_elapsed_seconds = kNoDaystart;
   errors_ = "";
 
   if (manifest_xml.length() < 1) {
@@ skipping 55 matching lines @@
     std::string error;
     if (!ParseSingleAppTag(apps[i], gupdate_ns, &current, &error)) {
       ParseError("%s", error.c_str());
     } else {
       results_.list.push_back(current);
     }
   }
 
   return true;
 }