chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc - Issue 865163003: bookmarks: Move BookmarkNode into 'bookmarks' namespace.

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/test/integration/two_client_bookmarks_sync_test.cc

Issue 865163003: bookmarks: Move BookmarkNode into 'bookmarks' namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: enhanced_bookmarks fix Created 5 years, 10 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/test/integration/sync_errors_test.cc ('k') | chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc » ('j') | components/policy/core/browser/managed_bookmarks_tracker.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc

diff --git a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc

index 41b0e94fc9aef04f79e31ca31bbd401582087dbf..e574eec2bbd0d88a45cce7685c250eb464da3d8f 100644

--- a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc

+++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc

@@ -12,6 +12,7 @@

#include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"

#include "chrome/browser/sync/test/integration/sync_integration_test_util.h"

#include "chrome/browser/sync/test/integration/sync_test.h"

+#include "components/bookmarks/browser/bookmark_node.h"

#include "components/policy/core/common/mock_configuration_policy_provider.h"

#include "components/policy/core/common/policy_map.h"

#include "policy/policy_constants.h"

@@ -19,6 +20,7 @@

#include "testing/gmock/include/gmock/gmock.h"

#include "ui/base/layout.h"

+using bookmarks::BookmarkNode;

using bookmarks_helper::AddFolder;

using bookmarks_helper::AddURL;

using bookmarks_helper::AllModelsMatch;

@@ -1141,8 +1143,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,

ASSERT_TRUE(AddURL(0, folder, i, title, url) != NULL);

}

std::string title = IndexedFolderName(level);

- folder = AddFolder(

- 0, folder, folder->child_count(), title);

+ folder = AddFolder(0, folder, folder->child_count(), title);

ASSERT_TRUE(folder != NULL);

if (level == 5) folder_L5 = folder;

}