chrome/browser/ui/bookmarks/bookmark_editor_unittest.cc - Issue 242693003: Introduce BookmarkClient interface to abstract embedder

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/bookmarks/bookmark_editor_unittest.cc

Issue 242693003: Introduce BookmarkClient interface to abstract embedder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Work around STL android bug 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/sync/test/integration/bookmarks_helper.cc ('k') | chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/bookmarks/bookmark_editor_unittest.cc

diff --git a/chrome/browser/ui/bookmarks/bookmark_editor_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_editor_unittest.cc

index 186e1b243badf4e410dabce72b466a9c86e40e91..f050cc6cc91cec1c8269e09af25c64f2c466b738 100644

--- a/chrome/browser/ui/bookmarks/bookmark_editor_unittest.cc

+++ b/chrome/browser/ui/bookmarks/bookmark_editor_unittest.cc

@@ -5,6 +5,7 @@

#include "chrome/browser/ui/bookmarks/bookmark_editor.h"

#include "base/strings/utf_string_conversions.h"

+#include "chrome/browser/bookmarks/test_bookmark_client.h"

#include "testing/gtest/include/gtest/gtest.h"

using base::ASCIIToUTF16;

@@ -12,15 +13,16 @@ using base::ASCIIToUTF16;

namespace {

TEST(BookmarkEditorTest, ApplyEditsWithNoFolderChange) {

- BookmarkModel model(NULL, false);

- const BookmarkNode* bookmarkbar = model.bookmark_bar_node();

- model.AddURL(bookmarkbar, 0, ASCIIToUTF16("url0"), GURL("chrome://newtab"));

- model.AddURL(bookmarkbar, 1, ASCIIToUTF16("url1"), GURL("chrome://newtab"));

+ test::TestBookmarkClient client;

+ scoped_ptr<BookmarkModel> model(client.CreateModel(false));

+ const BookmarkNode* bookmarkbar = model->bookmark_bar_node();

+ model->AddURL(bookmarkbar, 0, ASCIIToUTF16("url0"), GURL("chrome://newtab"));

+ model->AddURL(bookmarkbar, 1, ASCIIToUTF16("url1"), GURL("chrome://newtab"));

{

BookmarkEditor::EditDetails detail(

BookmarkEditor::EditDetails::AddFolder(bookmarkbar, 1));

- BookmarkEditor::ApplyEditsWithNoFolderChange(&model,

+ BookmarkEditor::ApplyEditsWithNoFolderChange(model.get(),

bookmarkbar,

detail,

ASCIIToUTF16("folder0"),

@@ -30,7 +32,7 @@ TEST(BookmarkEditorTest, ApplyEditsWithNoFolderChange) {

{

BookmarkEditor::EditDetails detail(

BookmarkEditor::EditDetails::AddFolder(bookmarkbar, -1));

- BookmarkEditor::ApplyEditsWithNoFolderChange(&model,

+ BookmarkEditor::ApplyEditsWithNoFolderChange(model.get(),

bookmarkbar,

detail,

ASCIIToUTF16("folder1"),

@@ -40,7 +42,7 @@ TEST(BookmarkEditorTest, ApplyEditsWithNoFolderChange) {

{

BookmarkEditor::EditDetails detail(

BookmarkEditor::EditDetails::AddFolder(bookmarkbar, 10));

- BookmarkEditor::ApplyEditsWithNoFolderChange(&model,

+ BookmarkEditor::ApplyEditsWithNoFolderChange(model.get(),

bookmarkbar,

detail,

ASCIIToUTF16("folder2"),