chrome/browser/sync/glue/typed_url_model_associator_unittest.cc - Issue 8414043: Refactored TypedUrlChangeProcessor to treat ADD and UPDATE similarly.

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/typed_url_model_associator_unittest.cc

Issue 8414043: Refactored TypedUrlChangeProcessor to treat ADD and UPDATE similarly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Now set the page title in the integration test to ensure it is synced. Created 9 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:

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

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

index f5d548bce7ed35cfde88f152a030d0bbcf32d4f3..a54cd131b6640804599d3bf82c7120806f6e67a2 100644

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

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

@@ -103,7 +103,7 @@ TEST_F(TypedUrlModelAssociatorTest, MergeUrls) {

history::URLRow new_row3(GURL("http://pie.com/"));

std::vector<history::VisitInfo> new_visits3;

EXPECT_EQ(TypedUrlModelAssociator::DIFF_LOCAL_ROW_CHANGED |

- TypedUrlModelAssociator::DIFF_LOCAL_TITLE_CHANGED,

+ TypedUrlModelAssociator::DIFF_NONE,

TypedUrlModelAssociator::MergeUrls(specs3, row3, &visits3,

&new_row3, &new_visits3));

EXPECT_TRUE(URLsEqual(new_row3, expected3));

@@ -122,7 +122,6 @@ TEST_F(TypedUrlModelAssociatorTest, MergeUrls) {

history::URLRow new_row4(GURL("http://pie.com/"));

std::vector<history::VisitInfo> new_visits4;

EXPECT_EQ(TypedUrlModelAssociator::DIFF_UPDATE_NODE |

- TypedUrlModelAssociator::DIFF_LOCAL_TITLE_CHANGED |

TypedUrlModelAssociator::DIFF_LOCAL_ROW_CHANGED |

TypedUrlModelAssociator::DIFF_LOCAL_VISITS_ADDED,

TypedUrlModelAssociator::MergeUrls(specs4, row4, &visits4,