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

Unified Diff: chrome/browser/component_updater/component_patcher.cc

Issue 213923002: Revert of Use UtilityProcessHost to patch files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nonblocking
Patch Set: Created 6 years, 9 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: chrome/browser/component_updater/component_patcher.cc
diff --git a/chrome/browser/component_updater/component_patcher.cc b/chrome/browser/component_updater/component_patcher.cc
index 78064300c121716ef05550db72132716a2cfb7dc..59f283aaf175801e3bf9cbe9729f297135e6a5a6 100644
--- a/chrome/browser/component_updater/component_patcher.cc
+++ b/chrome/browser/component_updater/component_patcher.cc
@@ -7,15 +7,11 @@
#include <string>
#include <vector>
-#include "base/basictypes.h"
#include "base/file_util.h"
-#include "base/files/file_path.h"
#include "base/json/json_file_value_serializer.h"
-#include "base/memory/weak_ptr.h"
#include "base/values.h"
#include "chrome/browser/component_updater/component_patcher_operation.h"
#include "chrome/browser/component_updater/component_updater_service.h"
-#include "content/public/browser/browser_thread.h"
namespace component_updater {
@@ -38,83 +34,58 @@
} // namespace
-ComponentPatcher::ComponentPatcher(
+// The patching support is not cross-platform at the moment.
+ComponentPatcherCrossPlatform::ComponentPatcherCrossPlatform() {}
+
+ComponentUnpacker::Error ComponentPatcherCrossPlatform::Patch(
+ PatchType patch_type,
+ const base::FilePath& input_file,
+ const base::FilePath& patch_file,
+ const base::FilePath& output_file,
+ int* error) {
+ return ComponentUnpacker::kDeltaUnsupportedCommand;
+}
+
+
+// Takes the contents of a differential component update in input_dir
+// and produces the contents of a full component update in unpack_dir
+// using input_abs_path_ files that the installer knows about.
+void DifferentialUpdatePatch(
const base::FilePath& input_dir,
const base::FilePath& unpack_dir,
+ ComponentPatcher* patcher,
ComponentInstaller* installer,
- bool in_process,
- scoped_refptr<base::SequencedTaskRunner> task_runner)
- : input_dir_(input_dir),
- unpack_dir_(unpack_dir),
- installer_(installer),
- in_process_(in_process),
- task_runner_(task_runner) {
-}
-
-ComponentPatcher::~ComponentPatcher() {
-}
-
-void ComponentPatcher::Start(const ComponentUnpacker::Callback& callback) {
- callback_ = callback;
- task_runner_->PostTask(FROM_HERE,
- base::Bind(&ComponentPatcher::StartPatching,
- scoped_refptr<ComponentPatcher>(this)));
-}
-
-void ComponentPatcher::StartPatching() {
- commands_.reset(ReadCommands(input_dir_));
- if (!commands_.get()) {
- DonePatching(ComponentUnpacker::kDeltaBadCommands, 0);
- } else {
- next_command_ = commands_->begin();
- PatchNextFile();
- }
-}
-
-void ComponentPatcher::PatchNextFile() {
- if (next_command_ == commands_->end()) {
- DonePatching(ComponentUnpacker::kNone, 0);
+ base::Callback<void(ComponentUnpacker::Error, int)> callback) {
+ int error = 0;
+ scoped_ptr<base::ListValue> commands(ReadCommands(input_dir));
+ if (!commands.get()) {
+ callback.Run(ComponentUnpacker::kDeltaBadCommands, error);
return;
}
- if (!(*next_command_)->IsType(base::Value::TYPE_DICTIONARY)) {
- DonePatching(ComponentUnpacker::kDeltaBadCommands, 0);
- return;
+
+ for (base::ValueVector::const_iterator command = commands->begin(),
+ end = commands->end(); command != end; command++) {
+ if (!(*command)->IsType(base::Value::TYPE_DICTIONARY)) {
+ callback.Run(ComponentUnpacker::kDeltaBadCommands, error);
+ return;
+ }
+ base::DictionaryValue* command_args =
+ static_cast<base::DictionaryValue*>(*command);
+ scoped_ptr<DeltaUpdateOp> operation(CreateDeltaUpdateOp(command_args));
+ if (!operation) {
+ callback.Run(ComponentUnpacker::kDeltaUnsupportedCommand, error);
+ return;
+ }
+
+ ComponentUnpacker::Error result = operation->Run(
+ command_args, input_dir, unpack_dir, patcher, installer, &error);
+ if (result != ComponentUnpacker::kNone) {
+ callback.Run(result, error);
+ return;
+ }
}
- const base::DictionaryValue* command_args =
- static_cast<base::DictionaryValue*>(*next_command_);
- current_operation_ = CreateDeltaUpdateOp(*command_args);
- if (!current_operation_) {
- DonePatching(ComponentUnpacker::kDeltaUnsupportedCommand, 0);
- return;
- }
- current_operation_->Run(
- command_args,
- input_dir_,
- unpack_dir_,
- installer_,
- in_process_,
- base::Bind(&ComponentPatcher::DonePatchingFile,
- scoped_refptr<ComponentPatcher>(this)),
- task_runner_);
-}
-void ComponentPatcher::DonePatchingFile(ComponentUnpacker::Error error,
- int extended_error) {
- if (error != ComponentUnpacker::kNone) {
- DonePatching(error, extended_error);
- } else {
- ++next_command_;
- PatchNextFile();
- }
-}
-
-void ComponentPatcher::DonePatching(ComponentUnpacker::Error error,
- int extended_error) {
- current_operation_ = NULL;
- task_runner_->PostTask(FROM_HERE, base::Bind(callback_,
- error,
- extended_error));
- callback_.Reset();
+ callback.Run(ComponentUnpacker::kNone, error);
}
} // namespace component_updater
« no previous file with comments | « chrome/browser/component_updater/component_patcher.h ('k') | chrome/browser/component_updater/component_patcher_operation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698