Index: components/autofill/core/browser/webdata/autofill_data_type_controller.cc |
diff --git a/components/autofill/core/browser/webdata/autofill_data_type_controller.cc b/components/autofill/core/browser/webdata/autofill_data_type_controller.cc |
index 52965198eb59fe1b9291eb6e4a0f81b89ef5fe32..a5ab249cfba8715bffabb3d41e3ba356b4d82cee 100644 |
--- a/components/autofill/core/browser/webdata/autofill_data_type_controller.cc |
+++ b/components/autofill/core/browser/webdata/autofill_data_type_controller.cc |
@@ -18,10 +18,12 @@ AutofillDataTypeController::AutofillDataTypeController( |
const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread, |
const scoped_refptr<base::SingleThreadTaskRunner>& db_thread, |
const base::Closure& error_callback, |
- sync_driver::SyncClient* sync_client) |
+ sync_driver::SyncClient* sync_client, |
+ const scoped_refptr<autofill::AutofillWebDataService>& web_data_service) |
: NonUIDataTypeController(ui_thread, error_callback, sync_client), |
sync_client_(sync_client), |
- db_thread_(db_thread) {} |
+ db_thread_(db_thread), |
+ web_data_service_(web_data_service) {} |
syncer::ModelType AutofillDataTypeController::type() const { |
return syncer::AUTOFILL; |
@@ -53,16 +55,13 @@ bool AutofillDataTypeController::StartModels() { |
DCHECK(ui_thread()->BelongsToCurrentThread()); |
DCHECK_EQ(MODEL_STARTING, state()); |
- scoped_refptr<autofill::AutofillWebDataService> web_data_service = |
- sync_client_->GetWebDataService(); |
- |
- if (!web_data_service) |
+ if (!web_data_service_) |
return false; |
- if (web_data_service->IsDatabaseLoaded()) { |
+ if (web_data_service_->IsDatabaseLoaded()) { |
return true; |
} else { |
- web_data_service->RegisterDBLoadedCallback( |
+ web_data_service_->RegisterDBLoadedCallback( |
base::Bind(&AutofillDataTypeController::WebDatabaseLoaded, this)); |
return false; |
} |