[Sync] Add custom passphrase time tracking

We now track when a custom passphrase is set, and in conjunction with
the migration time now support querying the passphrase time (returns
migration time for FROZEN_IMPLICIT type, or custom passphrase time for
CUSTOM_PASSPHRASE type).

Plumb this information up through to the PSS for eventual use in the UI.

BUG=129665


Review URL: https://chromiumcodereview.appspot.com/11098007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161478 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 1 deletions

diff --git a/sync/internal_api/js_sync_encryption_handler_observer_unittest.cc b/sync/internal_api/js_sync_encryption_handler_observer_unittest.cc
index dc99328..f363de1 100644
--- a/sync/internal_api/js_sync_encryption_handler_observer_unittest.cc
+++ b/sync/internal_api/js_sync_encryption_handler_observer_unittest.cc
@@ -14,6 +14,7 @@
 #include "sync/js/js_event_details.h"
 #include "sync/js/js_test_util.h"
 #include "sync/util/cryptographer.h"
+#include "sync/util/time.h"
 #include "sync/test/fake_encryptor.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -158,12 +159,13 @@ TEST_F(JsSyncEncryptionHandlerObserverTest, OnPassphraseTypeChanged) {
 
   DictionaryValue passphrase_type_details;
   passphrase_type_details.SetString("passphraseType", "IMPLICIT_PASSPHRASE");
+  passphrase_type_details.SetInteger("explicitPassphraseTime", 10);
   EXPECT_CALL(mock_js_event_handler_,
               HandleJsEvent("onPassphraseTypeChanged",
                             HasDetailsAsDictionary(passphrase_type_details)));
 
   js_sync_encryption_handler_observer_.OnPassphraseTypeChanged(
-      IMPLICIT_PASSPHRASE);
+      IMPLICIT_PASSPHRASE, ProtoTimeToTime(10));
   PumpLoop();
 }