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

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

Issue 25883006: Support asynchronous patching operations in the component updater. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@tests
Patch Set: sorin@, cpu@ review Created 7 years, 1 month 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_win.cc
diff --git a/chrome/browser/component_updater/component_patcher_win.cc b/chrome/browser/component_updater/component_patcher_win.cc
index 20160b0e025629fb0b5efb09d13fa8b331bbd2e6..61bbd6163c7d7c5d0a451e8f7f0e314981f98c5f 100644
--- a/chrome/browser/component_updater/component_patcher_win.cc
+++ b/chrome/browser/component_updater/component_patcher_win.cc
@@ -61,7 +61,7 @@ base::FilePath FindSetupProgram() {
// encountered errors, and kDeltaPatchProcessFailure if there was an error
// when running the patch code out of process. In the error case, detailed error
// information could be returned in the error parameter.
-ComponentUnpacker::Error ComponentPatcherWin::Patch(
+component_updater::Error ComponentPatcherWin::Patch(
PatchType patch_type,
const base::FilePath& input_file,
const base::FilePath& patch_file,
@@ -71,7 +71,7 @@ ComponentUnpacker::Error ComponentPatcherWin::Patch(
const base::FilePath exe_path = FindSetupProgram();
if (exe_path.empty())
- return ComponentUnpacker::kDeltaPatchProcessFailure;
+ return component_updater::kDeltaPatchProcessFailure;
const std::string patch_type_str(PatchTypeToCommandLineSwitch(patch_type));
@@ -88,7 +88,7 @@ ComponentUnpacker::Error ComponentPatcherWin::Patch(
if (!job ||
!base::SetJobObjectLimitFlags(job, JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE)) {
*error = GetLastError();
- return ComponentUnpacker::kDeltaPatchProcessFailure;
+ return component_updater::kDeltaPatchProcessFailure;
}
base::LaunchOptions launch_options;
@@ -104,11 +104,11 @@ ComponentUnpacker::Error ComponentPatcherWin::Patch(
if (!base::LaunchProcess(setup_path, launch_options, &ph) ||
!base::WaitForExitCode(ph, &exit_code)) {
*error = GetLastError();
- return ComponentUnpacker::kDeltaPatchProcessFailure;
+ return component_updater::kDeltaPatchProcessFailure;
}
*error = exit_code;
- return *error ? ComponentUnpacker::kDeltaOperationFailure :
- ComponentUnpacker::kNone;
+ return *error ? component_updater::kDeltaOperationFailure :
+ component_updater::kNone;
}

Powered by Google App Engine
This is Rietveld 408576698