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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc

Issue 11572031: "Open All Bookmarks in Incognito Window" opens only valid URLs (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: modify mac build failure Created 8 years 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
Index: chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
index 7e461e9ae007acfa16c81fa90f8257a85c01dc9a..fcdf6b8b52d87c4ade393dd5968e1bd7a29e743e 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
@@ -95,6 +95,7 @@ class BookmarkContextMenuTest : public testing::Test {
// a
// F1
// f1a
+ // -f1b as "chrome://settings"
// F11
// f11a
// F2
@@ -107,7 +108,8 @@ class BookmarkContextMenuTest : public testing::Test {
model_->AddURL(bb_node, 0, ASCIIToUTF16("a"), GURL(test_base + "a"));
const BookmarkNode* f1 = model_->AddFolder(bb_node, 1, ASCIIToUTF16("F1"));
model_->AddURL(f1, 0, ASCIIToUTF16("f1a"), GURL(test_base + "f1a"));
- const BookmarkNode* f11 = model_->AddFolder(f1, 1, ASCIIToUTF16("F11"));
+ model_->AddURL(f1, 1, ASCIIToUTF16("f1b"), GURL("chrome://settings"));
+ const BookmarkNode* f11 = model_->AddFolder(f1, 2, ASCIIToUTF16("F11"));
model_->AddURL(f11, 0, ASCIIToUTF16("f11a"), GURL(test_base + "f11a"));
model_->AddFolder(bb_node, 2, ASCIIToUTF16("F2"));
model_->AddFolder(bb_node, 3, ASCIIToUTF16("F3"));
@@ -133,9 +135,19 @@ TEST_F(BookmarkContextMenuTest, DeleteURL) {
// Tests open all on a folder with a couple of bookmarks.
TEST_F(BookmarkContextMenuTest, OpenAll) {
const BookmarkNode* folder = model_->bookmark_bar_node()->GetChild(1);
- chrome::OpenAll(NULL, &navigator_, folder, NEW_FOREGROUND_TAB);
+ chrome::OpenAll(NULL, &navigator_, folder, NEW_FOREGROUND_TAB, NULL);
// Should have navigated to F1's child but not F11's child.
+ ASSERT_EQ(static_cast<size_t>(2), navigator_.urls_.size());
tfarina 2012/12/19 15:55:03 s/static_cast<size_t>(2)/2U
+ ASSERT_TRUE(folder->GetChild(0)->url() == navigator_.urls_[0]);
+}
+
+// Tests open all on a folder with a couple of bookmarks in incognito window.
+TEST_F(BookmarkContextMenuTest, OpenAllIngonito) {
+ const BookmarkNode* folder = model_->bookmark_bar_node()->GetChild(1);
+ chrome::OpenAll(NULL, &navigator_, folder, OFF_THE_RECORD, NULL);
+
+ // Should have navigated to only f1a but not f2a.
ASSERT_EQ(static_cast<size_t>(1), navigator_.urls_.size());
ASSERT_TRUE(folder->GetChild(0)->url() == navigator_.urls_[0]);
}

Powered by Google App Engine
This is Rietveld 408576698