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

Unit tests fail on Mac Dbg with this patch:
http://build.chromium.org/p/chromium.mac/buildstatus?builder=Mac%2010.6%20Tests%20%28dbg%29%284%29&number=29470
and
http://build.chromium.org/p/chromium.mac/buildstatus?builder=Mac%2010.7%20Tests%20%28dbg%29%284%29&number=12750

> Differential updates for components. We are adding support for delivering delta updates for Chrome components. Initial platform support for the patcher is Windows only. The update response includes both the full update and, if available, the differential update. The differential update is tried first, then the full update, if needed.
> 
> BUG=245318
> 
> Review URL: https://chromiumcodereview.appspot.com/15908002

TBR=sorin@chromium.org

Review URL: https://codereview.chromium.org/17551004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207823 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 19 deletions

diff --git a/extensions/common/crx_file.cc b/extensions/common/crx_file.cc
index 73e7f7b..4f50962 100644
--- a/extensions/common/crx_file.cc
+++ b/extensions/common/crx_file.cc
@@ -11,9 +11,6 @@ namespace {
 // The current version of the crx format.
 static const uint32 kCurrentVersion = 2;
 
-// The current version of the crx diff format.
-static const uint32 kCurrentDiffVersion = 0;
-
 // The maximum size the crx parser will tolerate for a public key.
 static const uint32 kMaxPublicKeySize = 1 << 16;
 
@@ -24,7 +21,6 @@ static const uint32 kMaxSignatureSize = 1 << 16;
 
 // The magic string embedded in the header.
 const char kCrxFileHeaderMagic[] = "Cr24";
-const char kCrxDiffFileHeaderMagic[] = "CrOD";
 
 scoped_ptr<CrxFile> CrxFile::Parse(const CrxFile::Header& header,
                                    CrxFile::Error* error) {
@@ -49,21 +45,12 @@ scoped_ptr<CrxFile> CrxFile::Create(const uint32 key_size,
 CrxFile::CrxFile(const Header& header) : header_(header) {
 }
 
-bool CrxFile::HeaderIsDelta(const CrxFile::Header& header) {
-  return !strncmp(kCrxDiffFileHeaderMagic, header.magic, sizeof(header.magic));
-}
-
 bool CrxFile::HeaderIsValid(const CrxFile::Header& header,
                             CrxFile::Error* error) {
   bool valid = false;
-  bool diffCrx = false;
-  if (!strncmp(kCrxDiffFileHeaderMagic, header.magic, sizeof(header.magic)))
-    diffCrx = true;
-  if (strncmp(kCrxFileHeaderMagic, header.magic, sizeof(header.magic)) &&
-      !diffCrx)
+  if (strncmp(kCrxFileHeaderMagic, header.magic, sizeof(header.magic)))
     *error = kWrongMagic;
-  else if (header.version != kCurrentVersion
-      && !(diffCrx && header.version == kCurrentDiffVersion))
+  else if (header.version != kCurrentVersion)
     *error = kInvalidVersion;
   else if (header.key_size > kMaxPublicKeySize)
     *error = kInvalidKeyTooLarge;
diff --git a/extensions/common/crx_file.h b/extensions/common/crx_file.h
index 3ac8189..cb450af 100644
--- a/extensions/common/crx_file.h
+++ b/extensions/common/crx_file.h
@@ -60,10 +60,6 @@ class CrxFile {
   // Returns the header structure for writing out to a CRX file.
   const Header& header() const { return header_; }
 
-  // Checks a valid |header| to determine whether or not the CRX represents a
-  // differential CRX.
-  static bool HeaderIsDelta(const Header& header);
-
  private:
   Header header_;