[Sync] Add keystore encryption info to about:sync

This patch adds the following fields under the encryption section of about:sync
- Has Keystore Key: whether the encryption handler has a keystore encryption key
- Migration Time: the time migration was performed, or "Not Migrated" if
  migration hasn't been performed yet
- Passphrase Type: the actual passphrase type (provides more detail than
   Is Using Explicit Passphrase, but stored at a diff layer)

Added sync/api/time.h, which just includes sync/util/time.h but is accessible
from chrome/

BUG=129665


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

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

1 files changed, 4 insertions, 5 deletions

diff --git a/sync/internal_api/sync_encryption_handler_impl.h b/sync/internal_api/sync_encryption_handler_impl.h
index f54055b..27f7080 100644
--- a/sync/internal_api/sync_encryption_handler_impl.h
+++ b/sync/internal_api/sync_encryption_handler_impl.h
@@ -9,6 +9,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
+#include "base/time.h"
 #include "base/threading/thread_checker.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -62,9 +63,6 @@ class SyncEncryptionHandlerImpl
   virtual bool EncryptEverythingEnabled() const OVERRIDE;
   virtual PassphraseType GetPassphraseType() const OVERRIDE;
 
-  // TODO(zea): provide a method for getting the time at which the nigori
-  // node was migrated.
-
   // NigoriHandler implementation.
   // Note: all methods are invoked while the caller holds a transaction.
   virtual void ApplyNigoriUpdate(
@@ -88,6 +86,7 @@ class SyncEncryptionHandlerImpl
   ModelTypeSet GetEncryptedTypesUnsafe();
 
   bool MigratedToKeystore();
+  base::Time migration_time() const;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
@@ -287,8 +286,8 @@ class SyncEncryptionHandlerImpl
   // instantiation.
   int nigori_overwrite_count_;
 
-  // The time (in ms) the nigori was migrated to support keystore encryption.
-  int64 migration_time_ms_;
+  // The time the nigori was migrated to support keystore encryption.
+  base::Time migration_time_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncEncryptionHandlerImpl);
 };