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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm

Issue 10834161: Removing instances of profile_->GetBookmarkModel() as part of converting BookmarkModel to a PKS. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/memory/scoped_nsobject.h" 7 #include "base/memory/scoped_nsobject.h"
8 #include "base/sys_string_conversions.h" 8 #include "base/sys_string_conversions.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h" 12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h"
12 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 13 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 #include "testing/platform_test.h" 15 #include "testing/platform_test.h"
15 16
16 @interface BookmarkAllTabsControllerOverride : BookmarkAllTabsController 17 @interface BookmarkAllTabsControllerOverride : BookmarkAllTabsController
17 @end 18 @end
18 19
19 @implementation BookmarkAllTabsControllerOverride 20 @implementation BookmarkAllTabsControllerOverride
20 21
(...skipping 11 matching lines...) Expand all
32 33
33 @end 34 @end
34 35
35 class BookmarkAllTabsControllerTest : public CocoaProfileTest { 36 class BookmarkAllTabsControllerTest : public CocoaProfileTest {
36 public: 37 public:
37 const BookmarkNode* parent_node_; 38 const BookmarkNode* parent_node_;
38 BookmarkAllTabsControllerOverride* controller_; 39 BookmarkAllTabsControllerOverride* controller_;
39 const BookmarkNode* folder_a_; 40 const BookmarkNode* folder_a_;
40 41
41 void CreateModel() { 42 void CreateModel() {
42 BookmarkModel& model(*(profile()->GetBookmarkModel())); 43 BookmarkModel& model(*(BookmarkModelFactory::GetForProfile(profile())));
43 const BookmarkNode* root = model.bookmark_bar_node(); 44 const BookmarkNode* root = model.bookmark_bar_node();
44 folder_a_ = model.AddFolder(root, 0, ASCIIToUTF16("a")); 45 folder_a_ = model.AddFolder(root, 0, ASCIIToUTF16("a"));
45 model.AddURL(folder_a_, 0, ASCIIToUTF16("a-0"), GURL("http://a-0.com")); 46 model.AddURL(folder_a_, 0, ASCIIToUTF16("a-0"), GURL("http://a-0.com"));
46 model.AddURL(folder_a_, 1, ASCIIToUTF16("a-1"), GURL("http://a-1.com")); 47 model.AddURL(folder_a_, 1, ASCIIToUTF16("a-1"), GURL("http://a-1.com"));
47 model.AddURL(folder_a_, 2, ASCIIToUTF16("a-2"), GURL("http://a-2.com")); 48 model.AddURL(folder_a_, 2, ASCIIToUTF16("a-2"), GURL("http://a-2.com"));
48 } 49 }
49 50
50 virtual BookmarkAllTabsControllerOverride* CreateController() { 51 virtual BookmarkAllTabsControllerOverride* CreateController() {
51 return [[BookmarkAllTabsControllerOverride alloc] 52 return [[BookmarkAllTabsControllerOverride alloc]
52 initWithParentWindow:test_window() 53 initWithParentWindow:test_window()
(...skipping 23 matching lines...) Expand all
76 // OK button should always be enabled. 77 // OK button should always be enabled.
77 EXPECT_TRUE([controller_ okButtonEnabled]); 78 EXPECT_TRUE([controller_ okButtonEnabled]);
78 [controller_ selectTestNodeInBrowser:folder_a_]; 79 [controller_ selectTestNodeInBrowser:folder_a_];
79 [controller_ setDisplayName:@"ALL MY TABS"]; 80 [controller_ setDisplayName:@"ALL MY TABS"];
80 [controller_ ok:nil]; 81 [controller_ ok:nil];
81 EXPECT_EQ(4, folder_a_->child_count()); 82 EXPECT_EQ(4, folder_a_->child_count());
82 const BookmarkNode* folderChild = folder_a_->GetChild(3); 83 const BookmarkNode* folderChild = folder_a_->GetChild(3);
83 EXPECT_EQ(folderChild->GetTitle(), ASCIIToUTF16("ALL MY TABS")); 84 EXPECT_EQ(folderChild->GetTitle(), ASCIIToUTF16("ALL MY TABS"));
84 EXPECT_EQ(3, folderChild->child_count()); 85 EXPECT_EQ(3, folderChild->child_count());
85 } 86 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698