From 558063b7f257e2cbd545e8c465cd0b51803c24f5 Mon Sep 17 00:00:00 2001 From: huangs Date: Tue, 8 Sep 2015 11:27:29 -0700 Subject: Revert of [Courgette] Adding CourgetteConfig singleton and --experimental flag. (patchset #5 id:80001 of https://chromiumcodereview.appspot.com/1306193004/ ) Reason for revert: The original CL assumes Courgette had to deal with forward/backward compatibility issues. Turns out that (as seen in http://crbug.com/459505): - Courgette executable is shipped with new releases. - This allows Courgette workflow to proceed without being tied down to legacy. These new (to huangs@) facts render the original CL redundant. Original issue's description: > [Courgette] Adding CourgetteConfig singleton and --experimental flag. > > This prepare for upcoming experiments to reduce patch size. We want to > avoid disrupting existing functionality. > > Committed: https://crrev.com/fc0511d9067759336f42d04e918e8a3ce0b84376 > Cr-Commit-Position: refs/heads/master@{#346746} TBR=wfh@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1323263007 Cr-Commit-Position: refs/heads/master@{#347746} --- courgette/ensemble_create.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'courgette/ensemble_create.cc') diff --git a/courgette/ensemble_create.cc b/courgette/ensemble_create.cc index a0c2e0b..ea5873c 100644 --- a/courgette/ensemble_create.cc +++ b/courgette/ensemble_create.cc @@ -21,7 +21,6 @@ #include "base/logging.h" #include "base/time/time.h" -#include "courgette/courgette_config.h" #include "courgette/crc.h" #include "courgette/difference_estimator.h" #include "courgette/region.h" @@ -436,10 +435,8 @@ Status GenerateEnsemblePatch(SourceStream* base, // // Final output stream has a header followed by a StreamSet. // - uint32 ensemble_version = - CourgetteConfig::GetInstance()->ensemble_version(); if (!final_patch->WriteVarint32(CourgettePatchFile::kMagic) || - !final_patch->WriteVarint32(ensemble_version) || + !final_patch->WriteVarint32(CourgettePatchFile::kVersion) || !final_patch->WriteVarint32(CalculateCrc(old_region.start(), old_region.length())) || !final_patch->WriteVarint32(CalculateCrc(new_region.start(), @@ -455,4 +452,4 @@ Status GenerateEnsemblePatch(SourceStream* base, return C_OK; } -} // namespace courgette +} // namespace -- cgit v1.1