[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}