Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync / glue / password_data_type_controller.cc

diff --git a/src/chrome/browser/sync/glue/password_data_type_controller.cc b/src/chrome/browser/sync/glue/password_data_type_controller.cc
index 688c2a6..bbe873c 100644 (file)
--- a/src/chrome/browser/sync/glue/password_data_type_controller.cc
+++ b/src/chrome/browser/sync/glue/password_data_type_controller.cc
@@ -6,11 +6,12 @@
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
-#include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h"
 #include "chrome/browser/sync/glue/password_change_processor.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "components/password_manager/core/browser/password_store.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/api/sync_error.h"
 
@@ -22,9 +23,12 @@ PasswordDataTypeController::PasswordDataTypeController(
     ProfileSyncComponentsFactory* profile_sync_factory,
     Profile* profile,
     ProfileSyncService* sync_service)
-    : NonFrontendDataTypeController(profile_sync_factory,
-                                    profile,
-                                    sync_service) {
+    : NonFrontendDataTypeController(
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
+          base::Bind(&ChromeReportUnrecoverableError),
+          profile_sync_factory,
+          profile,
+          sync_service) {
 }
 
 syncer::ModelType PasswordDataTypeController::type() const {
@@ -47,6 +51,10 @@ bool PasswordDataTypeController::PostTaskOnBackendThread(
   return password_store_->ScheduleTask(task);
 }
 
+bool PasswordDataTypeController::IsOnBackendThread() {
+  return password_store_->GetBackgroundTaskRunner()->RunsTasksOnCurrentThread();
+}
+
 bool PasswordDataTypeController::StartModels() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_EQ(state(), MODEL_STARTING);
@@ -57,7 +65,7 @@ bool PasswordDataTypeController::StartModels() {
 
 ProfileSyncComponentsFactory::SyncComponents
 PasswordDataTypeController::CreateSyncComponents() {
-  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(IsOnBackendThread());
   DCHECK_EQ(state(), ASSOCIATING);
   return profile_sync_factory()->CreatePasswordSyncComponents(
       profile_sync_service(),