diff options
| author | Gilad Arnold <garnold@chromium.org> | 2014-06-05 14:07:53 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-06-13 05:34:28 +0000 |
| commit | d1c4d2dd3daed1d507038046c0355fbafb85260c (patch) | |
| tree | c25e3f382d17439215294aacfaa7b18e5b8e2d9b /action_processor_unittest.cc | |
| parent | 0a364bb65efa5c5cdcd49114080a646a39e030fc (diff) | |
Change ErrorCode into an enum class.
This change is needed in order for us to be able to import ErrorCode
symbols from chromeos_update_engine into chromeos_update_manager.
Unfortunately, shifting from plain 'enum' into an 'enum class' means
that the compiler treats the new class as a distinct type from int,
which in turn means that plenty of seamless arithmetic/bitwise
operations we used for manipulating error code values throughout the
code needed to be retrofitted with static_cast operators.
In the future, we should consider imposing a proper abstraction on
update engine error codes that'll prevent mingling with value encoding
directly and prevent such nastiness. It'll also make things more
coherent (types, semantics) and safer.
BUG=chromium:358329
TEST=Unit tests.
Change-Id: Ie55fa566b764cdab6c4785d995fb6daee4cb32d3
Reviewed-on: https://chromium-review.googlesource.com/203209
Tested-by: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>
Diffstat (limited to 'action_processor_unittest.cc')
| -rw-r--r-- | action_processor_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/action_processor_unittest.cc b/action_processor_unittest.cc index 20bded6b..a55f0d39 100644 --- a/action_processor_unittest.cc +++ b/action_processor_unittest.cc @@ -33,7 +33,7 @@ class ActionProcessorTestAction : public Action<ActionProcessorTestAction> { void PerformAction() {} void CompleteAction() { ASSERT_TRUE(processor()); - processor()->ActionComplete(this, kErrorCodeSuccess); + processor()->ActionComplete(this, ErrorCode::kSuccess); } string Type() const { return "ActionProcessorTestAction"; } }; @@ -66,7 +66,7 @@ class MyActionProcessorDelegate : public ActionProcessorDelegate { processing_done_called_(false), processing_stopped_called_(false), action_completed_called_(false), - action_exit_code_(kErrorCodeError) {} + action_exit_code_(ErrorCode::kError) {} virtual void ProcessingDone(const ActionProcessor* processor, ErrorCode code) { |