chrome/browser/sync/profile_sync_service_typed_url_unittest.cc - Issue 10152003: sync: Make BaseNode lookup-related Init functions return specific failures.

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

Issue 10152003: sync: Make BaseNode lookup-related Init functions return specific failures. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 8 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/profile_sync_service_session_unittest.cc ('k') | chrome/browser/sync/test/integration/enable_disable_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_typed_url_unittest.cc

diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc

index bbcde9e6226f861d0cc553a8b9764bc82df6b5a2..c4862ea9888f7bc058cea31de42d49c78a16f41f 100644

--- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc

+++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc

@@ -145,7 +145,8 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest {

const history::VisitVector& visits) {

sync_api::WriteTransaction trans(FROM_HERE, service_->GetUserShare());

sync_api::ReadNode typed_url_root(&trans);

- ASSERT_TRUE(typed_url_root.InitByTagLookup(browser_sync::kTypedUrlTag));

+ ASSERT_EQ(sync_api::BaseNode::INIT_OK,

+ typed_url_root.InitByTagLookup(browser_sync::kTypedUrlTag));

sync_api::WriteNode node(&trans);

std::string tag = url.url().spec();

@@ -230,13 +231,14 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest {

urls->clear();

sync_api::ReadTransaction trans(FROM_HERE, service_->GetUserShare());

sync_api::ReadNode typed_url_root(&trans);

- if (!typed_url_root.InitByTagLookup(browser_sync::kTypedUrlTag))

+ if (typed_url_root.InitByTagLookup(browser_sync::kTypedUrlTag) !=

+ sync_api::BaseNode::INIT_OK)

return;

int64 child_id = typed_url_root.GetFirstChildId();

while (child_id != sync_api::kInvalidId) {

sync_api::ReadNode child_node(&trans);

- if (!child_node.InitByIdLookup(child_id))

+ if (child_node.InitByIdLookup(child_id) != sync_api::BaseNode::INIT_OK)

return;

const sync_pb::TypedUrlSpecifics& typed_url(