| Index: chrome/browser/component_updater/component_patcher_operation.cc
|
| diff --git a/chrome/browser/component_updater/component_patcher_operation.cc b/chrome/browser/component_updater/component_patcher_operation.cc
|
| index 3f5f46a61354476cc3787cfd3c6d590709643d9f..a19f20efdf078a5e89348bfc0b2eebdb49ea512c 100644
|
| --- a/chrome/browser/component_updater/component_patcher_operation.cc
|
| +++ b/chrome/browser/component_updater/component_patcher_operation.cc
|
| @@ -34,6 +34,8 @@ const char kSha256[] = "sha256";
|
|
|
| } // namespace
|
|
|
| +namespace component_updater {
|
| +
|
| DeltaUpdateOp* CreateDeltaUpdateOp(base::DictionaryValue* command) {
|
| std::string operation;
|
| if (!command->GetString(kOp, &operation))
|
| @@ -53,12 +55,13 @@ DeltaUpdateOp::DeltaUpdateOp() {}
|
|
|
| DeltaUpdateOp::~DeltaUpdateOp() {}
|
|
|
| -ComponentUnpacker::Error DeltaUpdateOp::Run(base::DictionaryValue* command_args,
|
| - const base::FilePath& input_dir,
|
| - const base::FilePath& unpack_dir,
|
| - ComponentPatcher* patcher,
|
| - ComponentInstaller* installer,
|
| - int* error) {
|
| +ComponentUnpacker::Error DeltaUpdateOp::Run(
|
| + base::DictionaryValue* command_args,
|
| + const base::FilePath& input_dir,
|
| + const base::FilePath& unpack_dir,
|
| + ComponentPatcher* patcher,
|
| + ComponentInstaller* installer,
|
| + int* error) {
|
| std::string output_rel_path;
|
| if (!command_args->GetString(kOutput, &output_rel_path) ||
|
| !command_args->GetString(kSha256, &output_sha256_))
|
| @@ -77,7 +80,8 @@ ComponentUnpacker::Error DeltaUpdateOp::Run(base::DictionaryValue* command_args,
|
| return ComponentUnpacker::kIoError;
|
| }
|
|
|
| - ComponentUnpacker::Error run_result = DoRun(patcher, error);
|
| + ComponentUnpacker::Error run_result = DoRun(
|
| + patcher, error);
|
| if (run_result != ComponentUnpacker::kNone)
|
| return run_result;
|
|
|
| @@ -122,8 +126,9 @@ ComponentUnpacker::Error DeltaUpdateOpCopy::DoParseArguments(
|
| return ComponentUnpacker::kNone;
|
| }
|
|
|
| -ComponentUnpacker::Error DeltaUpdateOpCopy::DoRun(ComponentPatcher*,
|
| - int* error) {
|
| +ComponentUnpacker::Error DeltaUpdateOpCopy::DoRun(
|
| + ComponentPatcher*,
|
| + int* error) {
|
| *error = 0;
|
| if (!base::CopyFile(input_abs_path_, output_abs_path_))
|
| return ComponentUnpacker::kDeltaOperationFailure;
|
| @@ -220,3 +225,4 @@ ComponentUnpacker::Error DeltaUpdateOpPatchCourgette::DoRun(
|
| error);
|
| }
|
|
|
| +} // namespace component_updater
|
|
|