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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/test/integration/bookmarks_helper.cc

Issue 242823002: Extract GetNodeByID() method from BookmarkModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert a change in bookmarks_helper.cc that colides with a wstring and cq does not like that Created 6 years, 8 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/history/android/bookmark_model_sql_handler.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/bookmarks_helper.cc
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc
index 58ae2604e686cc44f879792cbcfff705e81da365..d83d6e8c995922e6253c5ffe667b636b489f9633 100644
--- a/chrome/browser/sync/test/integration/bookmarks_helper.cc
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
#include "chrome/browser/bookmarks/bookmark_model_observer.h"
+#include "chrome/browser/bookmarks/bookmark_utils.h"
#include "chrome/browser/favicon/favicon_service_factory.h"
#include "chrome/browser/favicon/favicon_util.h"
#include "chrome/browser/history/history_db_task.h"
@@ -421,13 +422,14 @@ const BookmarkNode* AddURL(int profile,
int index,
const std::wstring& title,
const GURL& url) {
- if (GetBookmarkModel(profile)->GetNodeByID(parent->id()) != parent) {
+ BookmarkModel* model = GetBookmarkModel(profile);
+ if (GetBookmarkNodeByID(model, parent->id()) != parent) {
LOG(ERROR) << "Node " << parent->GetTitle() << " does not belong to "
<< "Profile " << profile;
return NULL;
}
- const BookmarkNode* result = GetBookmarkModel(profile)->
- AddURL(parent, index, base::WideToUTF16(title), url);
+ const BookmarkNode* result =
+ model->AddURL(parent, index, base::WideToUTF16(title), url);
if (!result) {
LOG(ERROR) << "Could not add bookmark " << title << " to Profile "
<< profile;
@@ -435,9 +437,9 @@ const BookmarkNode* AddURL(int profile,
}
if (test()->use_verifier()) {
const BookmarkNode* v_parent = NULL;
- FindNodeInVerifier(GetBookmarkModel(profile), parent, &v_parent);
- const BookmarkNode* v_node = GetVerifierBookmarkModel()->
- AddURL(v_parent, index, base::WideToUTF16(title), url);
+ FindNodeInVerifier(model, parent, &v_parent);
+ const BookmarkNode* v_node = GetVerifierBookmarkModel()->AddURL(
+ v_parent, index, base::WideToUTF16(title), url);
if (!v_node) {
LOG(ERROR) << "Could not add bookmark " << title << " to the verifier";
return NULL;
@@ -462,13 +464,14 @@ const BookmarkNode* AddFolder(int profile,
const BookmarkNode* parent,
int index,
const std::wstring& title) {
- if (GetBookmarkModel(profile)->GetNodeByID(parent->id()) != parent) {
+ BookmarkModel* model = GetBookmarkModel(profile);
+ if (GetBookmarkNodeByID(model, parent->id()) != parent) {
LOG(ERROR) << "Node " << parent->GetTitle() << " does not belong to "
<< "Profile " << profile;
return NULL;
}
- const BookmarkNode* result = GetBookmarkModel(profile)->AddFolder(
- parent, index, base::WideToUTF16(title));
+ const BookmarkNode* result =
+ model->AddFolder(parent, index, base::WideToUTF16(title));
EXPECT_TRUE(result);
if (!result) {
LOG(ERROR) << "Could not add folder " << title << " to Profile "
@@ -477,7 +480,7 @@ const BookmarkNode* AddFolder(int profile,
}
if (test()->use_verifier()) {
const BookmarkNode* v_parent = NULL;
- FindNodeInVerifier(GetBookmarkModel(profile), parent, &v_parent);
+ FindNodeInVerifier(model, parent, &v_parent);
const BookmarkNode* v_node = GetVerifierBookmarkModel()->AddFolder(
v_parent, index, base::WideToUTF16(title));
if (!v_node) {
@@ -492,15 +495,16 @@ const BookmarkNode* AddFolder(int profile,
void SetTitle(int profile,
const BookmarkNode* node,
const std::wstring& new_title) {
- ASSERT_EQ(GetBookmarkModel(profile)->GetNodeByID(node->id()), node)
+ BookmarkModel* model = GetBookmarkModel(profile);
+ ASSERT_EQ(GetBookmarkNodeByID(model, node->id()), node)
<< "Node " << node->GetTitle() << " does not belong to "
<< "Profile " << profile;
if (test()->use_verifier()) {
const BookmarkNode* v_node = NULL;
- FindNodeInVerifier(GetBookmarkModel(profile), node, &v_node);
+ FindNodeInVerifier(model, node, &v_node);
GetVerifierBookmarkModel()->SetTitle(v_node, base::WideToUTF16(new_title));
}
- GetBookmarkModel(profile)->SetTitle(node, base::WideToUTF16(new_title));
+ model->SetTitle(node, base::WideToUTF16(new_title));
}
void SetFavicon(int profile,
@@ -508,17 +512,18 @@ void SetFavicon(int profile,
const GURL& icon_url,
const gfx::Image& image,
FaviconSource favicon_source) {
- ASSERT_EQ(GetBookmarkModel(profile)->GetNodeByID(node->id()), node)
+ BookmarkModel* model = GetBookmarkModel(profile);
+ ASSERT_EQ(GetBookmarkNodeByID(model, node->id()), node)
<< "Node " << node->GetTitle() << " does not belong to "
<< "Profile " << profile;
- ASSERT_EQ(BookmarkNode::URL, node->type())
- << "Node " << node->GetTitle() << " must be a url.";
+ ASSERT_EQ(BookmarkNode::URL, node->type()) << "Node " << node->GetTitle()
+ << " must be a url.";
if (urls_with_favicons_ == NULL)
urls_with_favicons_ = new std::set<GURL>();
urls_with_favicons_->insert(node->url());
if (test()->use_verifier()) {
const BookmarkNode* v_node = NULL;
- FindNodeInVerifier(GetBookmarkModel(profile), node, &v_node);
+ FindNodeInVerifier(model, node, &v_node);
SetFaviconImpl(test()->verifier(), v_node, icon_url, image, favicon_source);
}
SetFaviconImpl(test()->GetProfile(profile), node, icon_url, image,
@@ -528,19 +533,20 @@ void SetFavicon(int profile,
const BookmarkNode* SetURL(int profile,
const BookmarkNode* node,
const GURL& new_url) {
- if (GetBookmarkModel(profile)->GetNodeByID(node->id()) != node) {
+ BookmarkModel* model = GetBookmarkModel(profile);
+ if (GetBookmarkNodeByID(model, node->id()) != node) {
LOG(ERROR) << "Node " << node->GetTitle() << " does not belong to "
<< "Profile " << profile;
return NULL;
}
if (test()->use_verifier()) {
const BookmarkNode* v_node = NULL;
- FindNodeInVerifier(GetBookmarkModel(profile), node, &v_node);
+ FindNodeInVerifier(model, node, &v_node);
if (v_node->is_url())
GetVerifierBookmarkModel()->SetURL(v_node, new_url);
}
if (node->is_url())
- GetBookmarkModel(profile)->SetURL(node, new_url);
+ model->SetURL(node, new_url);
return node;
}
@@ -548,32 +554,32 @@ void Move(int profile,
const BookmarkNode* node,
const BookmarkNode* new_parent,
int index) {
- ASSERT_EQ(GetBookmarkModel(profile)->GetNodeByID(node->id()), node)
+ BookmarkModel* model = GetBookmarkModel(profile);
+ ASSERT_EQ(GetBookmarkNodeByID(model, node->id()), node)
<< "Node " << node->GetTitle() << " does not belong to "
<< "Profile " << profile;
if (test()->use_verifier()) {
const BookmarkNode* v_new_parent = NULL;
const BookmarkNode* v_node = NULL;
- FindNodeInVerifier(GetBookmarkModel(profile), new_parent, &v_new_parent);
- FindNodeInVerifier(GetBookmarkModel(profile), node, &v_node);
+ FindNodeInVerifier(model, new_parent, &v_new_parent);
+ FindNodeInVerifier(model, node, &v_node);
GetVerifierBookmarkModel()->Move(v_node, v_new_parent, index);
}
- GetBookmarkModel(profile)->Move(node, new_parent, index);
+ model->Move(node, new_parent, index);
}
-void Remove(int profile,
- const BookmarkNode* parent,
- int index) {
- ASSERT_EQ(GetBookmarkModel(profile)->GetNodeByID(parent->id()), parent)
+void Remove(int profile, const BookmarkNode* parent, int index) {
+ BookmarkModel* model = GetBookmarkModel(profile);
+ ASSERT_EQ(GetBookmarkNodeByID(model, parent->id()), parent)
<< "Node " << parent->GetTitle() << " does not belong to "
<< "Profile " << profile;
if (test()->use_verifier()) {
const BookmarkNode* v_parent = NULL;
- FindNodeInVerifier(GetBookmarkModel(profile), parent, &v_parent);
+ FindNodeInVerifier(model, parent, &v_parent);
ASSERT_TRUE(NodesMatch(parent->GetChild(index), v_parent->GetChild(index)));
GetVerifierBookmarkModel()->Remove(v_parent, index);
}
- GetBookmarkModel(profile)->Remove(parent, index);
+ model->Remove(parent, index);
}
void RemoveAll(int profile) {
@@ -590,19 +596,21 @@ void RemoveAll(int profile) {
}
void SortChildren(int profile, const BookmarkNode* parent) {
- ASSERT_EQ(GetBookmarkModel(profile)->GetNodeByID(parent->id()), parent)
+ BookmarkModel* model = GetBookmarkModel(profile);
+ ASSERT_EQ(GetBookmarkNodeByID(model, parent->id()), parent)
<< "Node " << parent->GetTitle() << " does not belong to "
<< "Profile " << profile;
if (test()->use_verifier()) {
const BookmarkNode* v_parent = NULL;
- FindNodeInVerifier(GetBookmarkModel(profile), parent, &v_parent);
+ FindNodeInVerifier(model, parent, &v_parent);
GetVerifierBookmarkModel()->SortChildren(v_parent);
}
- GetBookmarkModel(profile)->SortChildren(parent);
+ model->SortChildren(parent);
}
void ReverseChildOrder(int profile, const BookmarkNode* parent) {
- ASSERT_EQ(GetBookmarkModel(profile)->GetNodeByID(parent->id()), parent)
+ ASSERT_EQ(GetBookmarkNodeByID(GetBookmarkModel(profile), parent->id()),
+ parent)
<< "Node " << parent->GetTitle() << " does not belong to "
<< "Profile " << profile;
int child_count = parent->child_count();
« no previous file with comments | « chrome/browser/history/android/bookmark_model_sql_handler.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698