Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1577)

Unified Diff: components/update_client/component_patcher_operation.cc

Issue 808773005: Move most of the component updater artifacts to update_client. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/update_client/component_patcher_operation.cc
diff --git a/components/component_updater/component_patcher_operation.cc b/components/update_client/component_patcher_operation.cc
similarity index 91%
rename from components/component_updater/component_patcher_operation.cc
rename to components/update_client/component_patcher_operation.cc
index fdc5e0dad4fb11555a1a5394fb8ecc19d7718d9f..adb5b8f8209c6a934046ce3499c479480815d914 100644
--- a/components/component_updater/component_patcher_operation.cc
+++ b/components/update_client/component_patcher_operation.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/component_updater/component_patcher_operation.h"
+#include "components/update_client/component_patcher_operation.h"
#include <stdint.h>
#include <vector>
@@ -12,8 +12,8 @@
#include "base/files/memory_mapped_file.h"
#include "base/location.h"
#include "base/strings/string_number_conversions.h"
-#include "components/component_updater/component_patcher.h"
-#include "components/component_updater/component_updater_service.h"
+#include "components/update_client/component_patcher.h"
+#include "components/update_client/update_client.h"
#include "courgette/courgette.h"
#include "courgette/third_party/bsdiff.h"
#include "crypto/secure_hash.h"
@@ -22,7 +22,7 @@
using crypto::SecureHash;
-namespace component_updater {
+namespace update_client {
namespace {
@@ -217,10 +217,7 @@ ComponentUnpacker::Error DeltaUpdateOpPatch::DoParseArguments(
void DeltaUpdateOpPatch::DoRun(const ComponentUnpacker::Callback& callback) {
if (out_of_process_patcher_.get()) {
out_of_process_patcher_->Patch(
- operation_,
- GetTaskRunner(),
- input_abs_path_,
- patch_abs_path_,
+ operation_, GetTaskRunner(), input_abs_path_, patch_abs_path_,
output_abs_path_,
base::Bind(&DeltaUpdateOpPatch::DonePatching, this, callback));
return;
@@ -228,14 +225,13 @@ void DeltaUpdateOpPatch::DoRun(const ComponentUnpacker::Callback& callback) {
if (operation_ == kBsdiff) {
DonePatching(callback,
- courgette::ApplyBinaryPatch(
- input_abs_path_, patch_abs_path_, output_abs_path_));
+ courgette::ApplyBinaryPatch(input_abs_path_, patch_abs_path_,
+ output_abs_path_));
} else if (operation_ == kCourgette) {
- DonePatching(
- callback,
- courgette::ApplyEnsemblePatch(input_abs_path_.value().c_str(),
- patch_abs_path_.value().c_str(),
- output_abs_path_.value().c_str()));
+ DonePatching(callback, courgette::ApplyEnsemblePatch(
+ input_abs_path_.value().c_str(),
+ patch_abs_path_.value().c_str(),
+ output_abs_path_.value().c_str()));
} else {
NOTREACHED();
}
@@ -263,4 +259,4 @@ void DeltaUpdateOpPatch::DonePatching(
}
}
-} // namespace component_updater
+} // namespace update_client

Powered by Google App Engine
This is Rietveld 408576698