OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
6 | 6 |
7 #include "base/strings/sys_string_conversions.h" | 7 #include "base/strings/sys_string_conversions.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h" | 10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 | 37 |
38 @end | 38 @end |
39 | 39 |
40 class BookmarkAllTabsControllerTest : public CocoaProfileTest { | 40 class BookmarkAllTabsControllerTest : public CocoaProfileTest { |
41 public: | 41 public: |
42 const BookmarkNode* parent_node_; | 42 const BookmarkNode* parent_node_; |
43 BookmarkAllTabsControllerOverride* controller_; | 43 BookmarkAllTabsControllerOverride* controller_; |
44 const BookmarkNode* folder_a_; | 44 const BookmarkNode* folder_a_; |
45 | 45 |
46 void CreateModel() { | 46 void CreateModel() { |
47 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile()); | 47 BookmarkModel* model = |
| 48 BookmarkModelFactory::GetForBrowserContext(profile()); |
48 const BookmarkNode* root = model->bookmark_bar_node(); | 49 const BookmarkNode* root = model->bookmark_bar_node(); |
49 folder_a_ = model->AddFolder(root, 0, ASCIIToUTF16("a")); | 50 folder_a_ = model->AddFolder(root, 0, ASCIIToUTF16("a")); |
50 model->AddURL(folder_a_, 0, ASCIIToUTF16("a-0"), GURL("http://a-0.com")); | 51 model->AddURL(folder_a_, 0, ASCIIToUTF16("a-0"), GURL("http://a-0.com")); |
51 model->AddURL(folder_a_, 1, ASCIIToUTF16("a-1"), GURL("http://a-1.com")); | 52 model->AddURL(folder_a_, 1, ASCIIToUTF16("a-1"), GURL("http://a-1.com")); |
52 model->AddURL(folder_a_, 2, ASCIIToUTF16("a-2"), GURL("http://a-2.com")); | 53 model->AddURL(folder_a_, 2, ASCIIToUTF16("a-2"), GURL("http://a-2.com")); |
53 } | 54 } |
54 | 55 |
55 virtual BookmarkAllTabsControllerOverride* CreateController() { | 56 virtual BookmarkAllTabsControllerOverride* CreateController() { |
56 return [[BookmarkAllTabsControllerOverride alloc] | 57 return [[BookmarkAllTabsControllerOverride alloc] |
57 initWithParentWindow:test_window() | 58 initWithParentWindow:test_window() |
(...skipping 23 matching lines...) Expand all Loading... |
81 // OK button should always be enabled. | 82 // OK button should always be enabled. |
82 EXPECT_TRUE([controller_ okButtonEnabled]); | 83 EXPECT_TRUE([controller_ okButtonEnabled]); |
83 [controller_ selectTestNodeInBrowser:folder_a_]; | 84 [controller_ selectTestNodeInBrowser:folder_a_]; |
84 [controller_ setDisplayName:@"ALL MY TABS"]; | 85 [controller_ setDisplayName:@"ALL MY TABS"]; |
85 [controller_ ok:nil]; | 86 [controller_ ok:nil]; |
86 EXPECT_EQ(4, folder_a_->child_count()); | 87 EXPECT_EQ(4, folder_a_->child_count()); |
87 const BookmarkNode* folderChild = folder_a_->GetChild(3); | 88 const BookmarkNode* folderChild = folder_a_->GetChild(3); |
88 EXPECT_EQ(folderChild->GetTitle(), ASCIIToUTF16("ALL MY TABS")); | 89 EXPECT_EQ(folderChild->GetTitle(), ASCIIToUTF16("ALL MY TABS")); |
89 EXPECT_EQ(3, folderChild->child_count()); | 90 EXPECT_EQ(3, folderChild->child_count()); |
90 } | 91 } |
OLD | NEW |