commit 50b6dfcb847b5af98ceed86a488b821cc8dbe4c9
author peconn <peconn@chromium.org> Fri Apr 01 10:29:17 2016
committer Commit bot <commit-bot@chromium.org> Fri Apr 01 10:30:25 2016
tree c25eba241d8f96379721693cea0c57e7b2de1505
parent 1a390b5fd13acb9717c0f36f5fe550b8be92bd0b

Sign user out before clearing data.

This also moves most of the logic out of ConfirmImportSyncDataDialog, leaving its callers to clear the data if requested.

BUG=597245

Review URL: https://codereview.chromium.org/1840303004

Cr-Commit-Position: refs/heads/master@{#384538}

chrome/android/java_sources.gni

diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
index 68ea00b..2eb05518 100644
--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni
@@ -737,6 +737,7 @@
   "java/src/org/chromium/chrome/browser/sync/SyncController.java",
   "java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java",
   "java/src/org/chromium/chrome/browser/sync/SyncSessionsMetrics.java",
+  "java/src/org/chromium/chrome/browser/sync/SyncUserDataWiper.java",
   "java/src/org/chromium/chrome/browser/sync/ui/ConfirmImportSyncDataDialog.java",
   "java/src/org/chromium/chrome/browser/sync/ui/PassphraseActivity.java",
   "java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java",