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

Unified Diff: chrome/browser/sync/glue/non_ui_data_type_controller.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, 6 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
Index: chrome/browser/sync/glue/non_ui_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/non_ui_data_type_controller.cc b/chrome/browser/sync/glue/non_ui_data_type_controller.cc
index 860ea10c585602eeea622e04516662e4ac62216a..6cb75164f86764a512c06a928ad14d3783b83488 100644
--- a/chrome/browser/sync/glue/non_ui_data_type_controller.cc
+++ b/chrome/browser/sync/glue/non_ui_data_type_controller.cc
@@ -322,7 +322,7 @@ void NonUIDataTypeController::
this,
type(),
weak_ptr_factory.GetWeakPtr());
- if (!local_service_) {
+ if (!local_service_.get()) {
syncer::SyncError error(FROM_HERE, "Failed to connect to syncer.", type());
local_merge_result.set_error(error);
StartDone(ASSOCIATION_FAILED,
@@ -413,7 +413,7 @@ void NonUIDataTypeController::StopLocalServiceAsync() {
void NonUIDataTypeController::StopLocalService() {
DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (local_service_)
+ if (local_service_.get())
local_service_->StopSyncing(type());
local_service_.reset();
}
« no previous file with comments | « chrome/browser/sync/glue/history_model_worker.cc ('k') | chrome/browser/sync/glue/shared_change_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698