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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm
===================================================================
--- chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm (revision 149630)
+++ chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm (working copy)
@@ -8,6 +8,7 @@
#include "base/memory/scoped_nsobject.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#import "chrome/browser/ui/cocoa/animation_utils.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
@@ -134,7 +135,7 @@
}
void CreateModel() {
- BookmarkModel* model = profile()->GetBookmarkModel();
+ BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
const BookmarkNode* parent = model->bookmark_bar_node();
const BookmarkNode* folderA = model->AddFolder(parent,
parent->child_count(),
@@ -178,7 +179,7 @@
// Remove the bookmark with the long title.
void RemoveLongTitleNode() {
- BookmarkModel* model = profile()->GetBookmarkModel();
+ BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
model->Remove(longTitleNode_->parent(),
longTitleNode_->parent()->GetIndexOf(longTitleNode_));
}
@@ -186,7 +187,7 @@
// Add LOTS of nodes to our model if needed (e.g. scrolling).
// Returns the number of nodes added.
int AddLotsOfNodes() {
- BookmarkModel* model = profile()->GetBookmarkModel();
+ BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
for (int i = 0; i < kLotsOfNodesCount; i++) {
model->AddURL(folderA_, folderA_->child_count(),
ASCIIToUTF16("repeated title"),
@@ -295,7 +296,7 @@
// Confirm we grow right until end of screen, then start growing left
// until end of screen again, then right.
TEST_F(BookmarkBarFolderControllerTest, PositionRightLeftRight) {
- BookmarkModel* model = profile()->GetBookmarkModel();
+ BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
const BookmarkNode* parent = model->bookmark_bar_node();
const BookmarkNode* folder = parent;
@@ -695,7 +696,7 @@
TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToFolder) {
WithNoAnimation at_all;
- BookmarkModel& model(*profile()->GetBookmarkModel());
+ BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
@@ -768,7 +769,7 @@
}
TEST_F(BookmarkBarFolderControllerMenuTest, DragCopyBarBookmarkToFolder) {
- BookmarkModel& model(*profile()->GetBookmarkModel());
+ BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
@@ -832,7 +833,7 @@
}
TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveBarBookmarkToSubfolder) {
- BookmarkModel& model(*profile()->GetBookmarkModel());
+ BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
@@ -897,7 +898,7 @@
}
TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveWithinFolder) {
- BookmarkModel& model(*profile()->GetBookmarkModel());
+ BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
@@ -946,7 +947,7 @@
}
TEST_F(BookmarkBarFolderControllerMenuTest, DragParentOntoChild) {
- BookmarkModel& model(*profile()->GetBookmarkModel());
+ BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
@@ -983,7 +984,7 @@
}
TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveChildToParent) {
- BookmarkModel& model(*profile()->GetBookmarkModel());
+ BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
"2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
@@ -1035,7 +1036,7 @@
}
TEST_F(BookmarkBarFolderControllerMenuTest, DragWindowResizing) {
- BookmarkModel& model(*profile()->GetBookmarkModel());
+ BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const std::string
model_string("a b:[ b1 b2 b3 ] reallyReallyLongBookmarkName c ");
@@ -1075,7 +1076,7 @@
}
TEST_F(BookmarkBarFolderControllerMenuTest, MoveRemoveAddButtons) {
- BookmarkModel& model(*profile()->GetBookmarkModel());
+ BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const std::string model_string("1b 2f:[ 2f1b 2f2b 2f3b ] 3b 4b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
@@ -1138,7 +1139,7 @@
}
TEST_F(BookmarkBarFolderControllerMenuTest, ControllerForNode) {
- BookmarkModel& model(*profile()->GetBookmarkModel());
+ BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
@@ -1173,7 +1174,7 @@
}
TEST_F(BookmarkBarFolderControllerMenuTest, MenuSizingAndScrollArrows) {
- BookmarkModel& model(*profile()->GetBookmarkModel());
+ BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const std::string model_string("1b 2b 3b ");
model_test_utils::AddNodesFromModelString(model, root, model_string);
@@ -1268,7 +1269,7 @@
// See http://crbug.com/46101
TEST_F(BookmarkBarFolderControllerMenuTest, HoverThenDeleteBookmark) {
- BookmarkModel& model(*profile()->GetBookmarkModel());
+ BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const BookmarkNode* folder = model.AddFolder(root,
root->child_count(),
@@ -1334,7 +1335,7 @@
@end
TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkData) {
- BookmarkModel& model(*profile()->GetBookmarkModel());
+ BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
"2f3b ] 3b 4b ");
@@ -1395,7 +1396,7 @@
}
TEST_F(BookmarkBarFolderControllerMenuTest, DragBookmarkDataToTrash) {
- BookmarkModel& model(*profile()->GetBookmarkModel());
+ BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
"2f3b ] 3b 4b ");
@@ -1437,7 +1438,7 @@
}
TEST_F(BookmarkBarFolderControllerMenuTest, AddURLs) {
- BookmarkModel& model(*profile()->GetBookmarkModel());
+ BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
"2f3b ] 3b 4b ");
@@ -1482,7 +1483,7 @@
}
TEST_F(BookmarkBarFolderControllerMenuTest, DropPositionIndicator) {
- BookmarkModel& model(*profile()->GetBookmarkModel());
+ BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b 2f2f3b ] "
"2f3b ] 3b 4b ");
@@ -1541,7 +1542,7 @@
};
TEST_F(BookmarkBarFolderControllerClosingTest, DeleteClosesFolder) {
- BookmarkModel& model(*profile()->GetBookmarkModel());
+ BookmarkModel& model(*BookmarkModelFactory::GetForProfile(profile()));
const BookmarkNode* root = model.bookmark_bar_node();
const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b ] "
"2f3b ] 3b ");
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698