diff options
| author | Alex Vakulenko <avakulenko@chromium.org> | 2014-06-16 13:19:00 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-06-18 01:39:59 +0000 |
| commit | d2779df63aaad8b65fc5d4badee7dbc9bed7f2b6 (patch) | |
| tree | e34a511ee4068d8d9cd46a992a4e147f3afbd351 /update_attempter_unittest.cc | |
| parent | b683327ed3f50ef89324069fc87ee076b65bee46 (diff) | |
update_engine: fixed warnings from cpplint
Fixed all the cpplint warnings in update engine.
BUG=None
TEST=Unit tests still pass.
Change-Id: I285ae858eec8abe0b26ff203b99a42a200ceb71c
Reviewed-on: https://chromium-review.googlesource.com/204027
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
Diffstat (limited to 'update_attempter_unittest.cc')
| -rw-r--r-- | update_attempter_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/update_attempter_unittest.cc b/update_attempter_unittest.cc index aa0af3e1..43897aa2 100644 --- a/update_attempter_unittest.cc +++ b/update_attempter_unittest.cc @@ -154,7 +154,7 @@ class UpdateAttempterTest : public ::testing::Test { NiceMock<MockDBusWrapper> dbus_; UpdateAttempterUnderTest attempter_; NiceMock<ActionProcessorMock>* processor_; - NiceMock<PrefsMock>* prefs_; // shortcut to fake_system_state_->mock_prefs() + NiceMock<PrefsMock>* prefs_; // shortcut to fake_system_state_->mock_prefs() NiceMock<MockConnectionManager> mock_connection_manager; GMainLoop* loop_; @@ -410,7 +410,7 @@ gboolean UpdateAttempterTest::StaticNoScatteringDoneDuringManualUpdateTestStart( namespace { // Actions that will be built as part of an update check. -const string kUpdateActionTypes[] = { +const string kUpdateActionTypes[] = { // NOLINT(runtime/string) OmahaRequestAction::StaticType(), OmahaResponseHandlerAction::StaticType(), FilesystemCopierAction::StaticType(), @@ -425,12 +425,12 @@ const string kUpdateActionTypes[] = { }; // Actions that will be built as part of a user-initiated rollback. -const string kRollbackActionTypes[] = { +const string kRollbackActionTypes[] = { // NOLINT(runtime/string) InstallPlanAction::StaticType(), PostinstallRunnerAction::StaticType(), }; -} // namespace {} +} // namespace void UpdateAttempterTest::UpdateTestStart() { attempter_.set_http_response_code(200); @@ -643,7 +643,7 @@ void UpdateAttempterTest::ReadChannelFromPolicyTestStart() { fake_system_state_.set_device_policy(device_policy); EXPECT_CALL(*device_policy, GetReleaseChannelDelegated(_)).WillRepeatedly( - DoAll(SetArgumentPointee<0>(bool(false)), + DoAll(SetArgumentPointee<0>(bool(false)), // NOLINT(readability/casting) Return(true))); EXPECT_CALL(*device_policy, GetReleaseChannel(_)).WillRepeatedly( |