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

Unified Diff: chrome/browser/sync/profile_sync_service_bookmark_unittest.cc

Issue 11413153: Remove legacy GetURL(),SetURL(),GetFaviconBytes(),SetFaviconBytes() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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/bookmark_model_associator.cc ('k') | sync/internal_api/base_node.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
index 83203f89526a5fd3b3a0868bcf0baf7ea12cb8d7..618b4ee5afcfb222883ee1405737b015eb64b9e3 100644
--- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
@@ -93,8 +93,11 @@ class FakeServerChange {
EXPECT_EQ(node.GetParentId(), parent_id);
node.SetIsFolder(is_folder);
node.SetTitle(title);
- if (!is_folder)
- node.SetURL(GURL(url));
+ if (!is_folder) {
+ sync_pb::BookmarkSpecifics specifics(node.GetBookmarkSpecifics());
+ specifics.set_url(url);
+ node.SetBookmarkSpecifics(specifics);
+ }
syncer::ChangeRecord record;
record.action = syncer::ChangeRecord::ACTION_ADD;
record.id = node.GetId();
@@ -455,7 +458,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test {
}
EXPECT_EQ(bnode->is_folder(), gnode.GetIsFolder());
if (bnode->is_url())
- EXPECT_EQ(bnode->url(), gnode.GetURL());
+ EXPECT_EQ(bnode->url(), GURL(gnode.GetBookmarkSpecifics().url()));
// Check for position matches.
int browser_index = bnode->parent()->GetIndexOf(bnode);
« no previous file with comments | « chrome/browser/sync/glue/bookmark_model_associator.cc ('k') | sync/internal_api/base_node.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698