chrome/browser/sync/profile_sync_service_bookmark_unittest.cc - Issue 10825068: Removing instances of profile_->GetBookmarkModel() as part of converting BookmarkModel to a PKS.

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/sync/profile_sync_service_bookmark_unittest.cc

Issue 10825068: 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, 5 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/profile_sync_components_factory_impl.cc ('k') | chrome/browser/sync/test/integration/bookmarks_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_bookmark_unittest.cc

===================================================================

--- chrome/browser/sync/profile_sync_service_bookmark_unittest.cc (revision 149222)

+++ chrome/browser/sync/profile_sync_service_bookmark_unittest.cc (working copy)

@@ -21,6 +21,7 @@

#include "base/utf_string_conversions.h"

#include "chrome/browser/bookmarks/base_bookmark_model_observer.h"

#include "chrome/browser/bookmarks/bookmark_model.h"

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

#include "chrome/browser/sync/abstract_profile_sync_service_test.h"

#include "chrome/browser/sync/glue/bookmark_change_processor.h"

#include "chrome/browser/sync/glue/bookmark_model_associator.h"

@@ -350,7 +351,7 @@

void LoadBookmarkModel(LoadOption load, SaveOption save) {

bool delete_bookmarks = load == DELETE_EXISTING_STORAGE;

profile_.CreateBookmarkModel(delete_bookmarks);

- model_ = profile_.GetBookmarkModel();

+ model_ = BookmarkModelFactory::GetForProfile(&profile_);

// Wait for the bookmarks model to load.

profile_.BlockUntilBookmarkModelLoaded();

// This noticeably speeds up the unit tests that request it.

@@ -362,7 +363,7 @@

void StartSync() {

// Set up model associator.

model_associator_.reset(new TestBookmarkModelAssociator(

- profile_.GetBookmarkModel(),

+ BookmarkModelFactory::GetForProfile(&profile_),

test_user_share_.user_share(),

&mock_error_handler_));

syncer::SyncError error = model_associator_->AssociateModels();