chrome/browser/sync/glue/generic_change_processor.cc - Issue 15987009: Update chrome/ to use WeakPtr<T>::get() instead of implicit "operator T*"

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/glue/generic_change_processor.cc

Issue 15987009: Update chrome/ to use WeakPtr<T>::get() instead of implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 7 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/signin/profile_oauth2_token_service_request_unittest.cc ('k') | chrome/browser/sync/glue/history_model_worker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/generic_change_processor.cc

diff --git a/chrome/browser/sync/glue/generic_change_processor.cc b/chrome/browser/sync/glue/generic_change_processor.cc

index 41a14110f8d9dbf9c70050bb667b523d835c5033..61adbb64b77ac753b313f222bf28704af3be6a17 100644

--- a/chrome/browser/sync/glue/generic_change_processor.cc

+++ b/chrome/browser/sync/glue/generic_change_processor.cc

@@ -81,7 +81,7 @@ void GenericChangeProcessor::CommitChangesFromSyncModel() {

DCHECK(CalledOnValidThread());

if (syncer_changes_.empty())

return;

- if (!local_service_) {

+ if (!local_service_.get()) {

syncer::ModelType type = syncer_changes_[0].sync_data().GetDataType();

syncer::SyncError error(FROM_HERE, "Local service destroyed.", type);

error_handler()->OnSingleDatatypeUnrecoverableError(error.location(),

@@ -285,7 +285,7 @@ syncer::SyncError GenericChangeProcessor::ProcessSyncChanges(

NOTREACHED();

return error;

}

- if (merge_result_) {

+ if (merge_result_.get()) {

merge_result_->set_num_items_deleted(

merge_result_->num_items_deleted() + 1);

}

@@ -359,9 +359,9 @@ syncer::SyncError GenericChangeProcessor::ProcessSyncChanges(

}

sync_node.SetTitle(UTF8ToWide(change.sync_data().GetTitle()));

sync_node.SetEntitySpecifics(change.sync_data().GetSpecifics());

- if (merge_result_) {

- merge_result_->set_num_items_added(

- merge_result_->num_items_added() + 1);

+ if (merge_result_.get()) {

+ merge_result_->set_num_items_added(merge_result_->num_items_added() +

+ 1);

}

} else if (change.change_type() == syncer::SyncChange::ACTION_UPDATE) {

// TODO(zea): consider having this logic for all possible changes?

@@ -452,7 +452,7 @@ syncer::SyncError GenericChangeProcessor::ProcessSyncChanges(

sync_node.SetTitle(UTF8ToWide(change.sync_data().GetTitle()));

sync_node.SetEntitySpecifics(change.sync_data().GetSpecifics());

- if (merge_result_) {

+ if (merge_result_.get()) {

merge_result_->set_num_items_modified(

merge_result_->num_items_modified() + 1);

}