Chromium Code Reviews| Index: ios/chrome/browser/ui/bookmarks/bookmark_utils_ios_unittest.mm |
| diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_utils_ios_unittest.mm b/ios/chrome/browser/ui/bookmarks/bookmark_utils_ios_unittest.mm |
| index 841affa3125823e4d66996bb0624798e37d441a2..034d904f31e4b0d99001f487cc9eb36d5567b72c 100644 |
| --- a/ios/chrome/browser/ui/bookmarks/bookmark_utils_ios_unittest.mm |
| +++ b/ios/chrome/browser/ui/bookmarks/bookmark_utils_ios_unittest.mm |
| @@ -178,29 +178,17 @@ TEST_F(BookmarkIOSUtilsUnitTest, TestDefaultMoveFolder) { |
| } |
| TEST_F(BookmarkIOSUtilsUnitTest, TestPositionCache) { |
| - // Try to store and retrieve a cache for the allMenuItem. |
| - BookmarkMenuItem* item = [BookmarkMenuItem allMenuItem]; |
| + // Try to store and retrieve a cache for the folderMenuItem. |
| + const BookmarkNode* mobileNode = _bookmarkModel->mobile_node(); |
| + const BookmarkNode* f1 = AddFolder(mobileNode, @"f1"); |
| + BookmarkMenuItem* item = |
| + [BookmarkMenuItem folderMenuItemForNode:f1 rootAncestor:NULL]; |
| CGFloat position = 23; |
| bookmark_utils_ios::CachePosition(position, item); |
| - CGFloat outPosition; |
| BookmarkMenuItem* outItem; |
|
stkhapugin
2017/01/31 13:04:59
= nil
noyau (Ping after 24h)
2017/02/01 10:31:08
Done.
|
| + CGFloat outPosition; |
| BOOL result = bookmark_utils_ios::GetPositionCache(_bookmarkModel, &outItem, |
| &outPosition); |
| - if (experimental_flags::IsAllBookmarksEnabled()) { |
| - ASSERT_TRUE(result); |
| - EXPECT_NSEQ(item, outItem); |
| - EXPECT_NEAR(position, outPosition, 0.01); |
| - } else { |
| - ASSERT_FALSE(result); |
| - } |
| - |
| - // Try to store and retrieve a cache for the folderMenuItem. |
| - const BookmarkNode* mobileNode = _bookmarkModel->mobile_node(); |
| - const BookmarkNode* f1 = AddFolder(mobileNode, @"f1"); |
| - item = [BookmarkMenuItem folderMenuItemForNode:f1 rootAncestor:NULL]; |
| - bookmark_utils_ios::CachePosition(position, item); |
| - result = bookmark_utils_ios::GetPositionCache(_bookmarkModel, &outItem, |
| - &outPosition); |
| ASSERT_TRUE(result); |
| EXPECT_NSEQ(item, outItem); |
| EXPECT_NEAR(position, outPosition, 0.01); |