chrome/browser/sync/glue/preference_data_type_controller_unittest.cc - Issue 2867036: sync: Remove unused function ChromeModelHasUserCreatedNodes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/glue/preference_data_type_controller_unittest.cc

Issue 2867036: sync: Remove unused function ChromeModelHasUserCreatedNodes. (Closed) Base URL: git://git.chromium.org/chromium.git

Patch Set: explicit Created 10 years, 6 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 | « chrome/browser/sync/glue/password_model_associator.cc ('k') | chrome/browser/sync/glue/preference_model_associator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/preference_data_type_controller_unittest.cc

diff --git a/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc b/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc

index 74b1a4bd4e9af55c8b4eb9655774223e96b3d4e8..b732716873df9b43a66946816f1776c4af5d2ead 100644

--- a/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc

+++ b/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc

@@ -53,8 +53,6 @@ class PreferenceDataTypeControllerTest : public testing::Test {

}

void SetAssociateExpectations() {

- EXPECT_CALL(*model_associator_, ChromeModelHasUserCreatedNodes(_)).

- WillRepeatedly(DoAll(SetArgumentPointee<0>(false), Return(true)));

EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).

WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));

EXPECT_CALL(*model_associator_, AssociateModels()).

@@ -104,8 +102,6 @@ TEST_F(PreferenceDataTypeControllerTest, StartOk) {

SetStartExpectations();

SetAssociateExpectations();

SetActivateExpectations();

- EXPECT_CALL(*model_associator_, ChromeModelHasUserCreatedNodes(_)).

- WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));

EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).

WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));

@@ -128,8 +124,6 @@ TEST_F(PreferenceDataTypeControllerTest,

StartAssociationTriggersUnrecoverableError) {

SetStartExpectations();

// Set up association to fail with an unrecoverable error.

- EXPECT_CALL(*model_associator_, ChromeModelHasUserCreatedNodes(_)).

- WillRepeatedly(DoAll(SetArgumentPointee<0>(false), Return(true)));

EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).

WillRepeatedly(DoAll(SetArgumentPointee<0>(false), Return(false)));

EXPECT_CALL(start_callback_, Run(DataTypeController::UNRECOVERABLE_ERROR));

@@ -156,8 +150,6 @@ TEST_F(PreferenceDataTypeControllerTest, OnUnrecoverableError) {

SetStartExpectations();

SetAssociateExpectations();

SetActivateExpectations();

- EXPECT_CALL(*model_associator_, ChromeModelHasUserCreatedNodes(_)).

- WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));

EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).

WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));

EXPECT_CALL(service_, OnUnrecoverableError(_,_)).

« no previous file with comments | « chrome/browser/sync/glue/password_model_associator.cc ('k') | chrome/browser/sync/glue/preference_model_associator.h » ('j') | no next file with comments »