[Sync] Move PassphraseType to org.chromium.sync, take 2.
commitfb3312def105321cc360b6c371789cf9e8fc3753
authormaxbogue <maxbogue@chromium.org>
Thu, 27 Aug 2015 23:45:34 +0000 (27 16:45 -0700)
committerCommit bot <commit-bot@chromium.org>
Thu, 27 Aug 2015 23:46:07 +0000 (27 23:46 +0000)
tree468fce208adf91767c789c16d037ff6ff1d0c8b9
parent4559b5735d3e3c5adeb9f46fe3af5ab267c62edd
[Sync] Move PassphraseType to org.chromium.sync, take 2.

There's no reason for it to be off in its own confusing package.

The original change broke the build due to a sneaky
conflict with http://crrev.com/1320733002.

BUG=488563

Committed: https://crrev.com/071fc8cd4c4dca88aa1b0c29528f3c733f25d474
Cr-Commit-Position: refs/heads/master@{#345997}

patch from issue 1321483004 at patchset 1 (http://crrev.com/1321483004#ps1)

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

Cr-Commit-Position: refs/heads/master@{#346028}
chrome/android/java/src/org/chromium/chrome/browser/gsa/ContextReporter.java
chrome/android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java
chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java
chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseDialogFragment.java
chrome/android/java/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragment.java
chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java
sync/android/java/src/org/chromium/sync/PassphraseType.java [moved from sync/android/java/src/org/chromium/sync/internal_api/pub/PassphraseType.java with 98% similarity]