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

Unified Diff: components/sync_driver/non_ui_data_type_controller_unittest.cc

Issue 1380693004: [Sync] Fixing sync_driver lint violations and adding PRESUBMIT lint check. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cross
Patch Set: Removing lint fixes for revisit files, removing revisit patch dep. Created 5 years, 2 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
« no previous file with comments | « components/sync_driver/non_ui_data_type_controller_mock.h ('k') | components/sync_driver/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync_driver/non_ui_data_type_controller_unittest.cc
diff --git a/components/sync_driver/non_ui_data_type_controller_unittest.cc b/components/sync_driver/non_ui_data_type_controller_unittest.cc
index 3a3196b462e9c02c048abb322f15d98b847e0733..61b5e23bf1bc945a5453ef7b89f334b73170a607 100644
--- a/components/sync_driver/non_ui_data_type_controller_unittest.cc
+++ b/components/sync_driver/non_ui_data_type_controller_unittest.cc
@@ -4,6 +4,8 @@
#include "components/sync_driver/non_ui_data_type_controller.h"
+#include <vector>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
@@ -161,8 +163,6 @@ class NonUIDataTypeControllerFake
private:
~NonUIDataTypeControllerFake() override {}
- DISALLOW_COPY_AND_ASSIGN(NonUIDataTypeControllerFake);
-
struct PendingTask {
PendingTask(const tracked_objects::Location& from_here,
const base::Closure& task)
@@ -177,6 +177,8 @@ class NonUIDataTypeControllerFake
NonUIDataTypeControllerMock* mock_;
scoped_refptr<SharedChangeProcessor> change_processor_;
scoped_refptr<base::SingleThreadTaskRunner> backend_task_runner_;
+
+ DISALLOW_COPY_AND_ASSIGN(NonUIDataTypeControllerFake);
};
class SyncNonUIDataTypeControllerTest : public testing::Test,
@@ -228,14 +230,14 @@ class SyncNonUIDataTypeControllerTest : public testing::Test,
.WillOnce(Return(true));
EXPECT_CALL(*change_processor_.get(), SyncModelHasUserCreatedNodes(_))
.WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));
- EXPECT_CALL(*change_processor_.get(), GetAllSyncDataReturnError(_,_))
+ EXPECT_CALL(*change_processor_.get(), GetAllSyncDataReturnError(_, _))
.WillOnce(Return(syncer::SyncError()));
EXPECT_CALL(*change_processor_.get(), GetSyncCount()).WillOnce(Return(0));
EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
}
void SetActivateExpectations(DataTypeController::ConfigureResult result) {
- EXPECT_CALL(start_callback_, Run(result,_,_));
+ EXPECT_CALL(start_callback_, Run(result, _, _));
}
void SetStopExpectations() {
@@ -293,7 +295,7 @@ TEST_F(SyncNonUIDataTypeControllerTest, StartFirstRun) {
.WillOnce(Return(true));
EXPECT_CALL(*change_processor_.get(), SyncModelHasUserCreatedNodes(_))
.WillOnce(DoAll(SetArgumentPointee<0>(false), Return(true)));
- EXPECT_CALL(*change_processor_.get(), GetAllSyncDataReturnError(_,_))
+ EXPECT_CALL(*change_processor_.get(), GetAllSyncDataReturnError(_, _))
.WillOnce(Return(syncer::SyncError()));
EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
SetActivateExpectations(DataTypeController::OK_FIRST_RUN);
@@ -329,7 +331,7 @@ TEST_F(SyncNonUIDataTypeControllerTest, StartAssociationFailed) {
.WillOnce(Return(true));
EXPECT_CALL(*change_processor_.get(), SyncModelHasUserCreatedNodes(_))
.WillOnce(DoAll(SetArgumentPointee<0>(true), Return(true)));
- EXPECT_CALL(*change_processor_.get(), GetAllSyncDataReturnError(_,_))
+ EXPECT_CALL(*change_processor_.get(), GetAllSyncDataReturnError(_, _))
.WillOnce(Return(syncer::SyncError()));
EXPECT_CALL(*dtc_mock_.get(), RecordAssociationTime(_));
SetStartFailExpectations(DataTypeController::ASSOCIATION_FAILED);
@@ -395,7 +397,7 @@ TEST_F(SyncNonUIDataTypeControllerTest, AbortDuringAssociation) {
WaitOnEvent(&pause_db_thread),
SetArgumentPointee<0>(true),
Return(true)));
- EXPECT_CALL(*change_processor_.get(), GetAllSyncDataReturnError(_,_))
+ EXPECT_CALL(*change_processor_.get(), GetAllSyncDataReturnError(_, _))
.WillOnce(
Return(syncer::SyncError(FROM_HERE,
syncer::SyncError::DATATYPE_ERROR,
« no previous file with comments | « components/sync_driver/non_ui_data_type_controller_mock.h ('k') | components/sync_driver/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698