[Sync] Cache encrypted types info in ProfileSyncService

chrome/browser/sync/internal_api/syncapi_unittest.cc

Index: chrome/browser/sync/internal_api/syncapi_unittest.cc
diff --git a/chrome/browser/sync/internal_api/syncapi_unittest.cc b/chrome/browser/sync/internal_api/syncapi_unittest.cc
index 24dcffa8e36f8021aef6456e6544986a562aa85d..fbdd436bd07eeee42af80371034f7604fd2daf91 100644
--- a/chrome/browser/sync/internal_api/syncapi_unittest.cc
+++ b/chrome/browser/sync/internal_api/syncapi_unittest.cc
@@ -629,7 +629,8 @@ class SyncManagerObserverMock : public SyncManager::Observer {
   MOCK_METHOD1(OnUpdatedToken, void(const std::string&));  // NOLINT
   MOCK_METHOD0(OnClearServerDataFailed, void());  // NOLINT
   MOCK_METHOD0(OnClearServerDataSucceeded, void());  // NOLINT
-  MOCK_METHOD1(OnEncryptionComplete, void(const ModelTypeSet&));  // NOLINT
+  MOCK_METHOD2(OnEncryptionComplete,
+               void(const ModelTypeSet&, bool));  // NOLINT
   MOCK_METHOD1(OnActionableError,
                  void(const browser_sync::SyncProtocolError&));  // NOLINT
 };
@@ -1212,7 +1213,7 @@ TEST_F(SyncManagerTest, RefreshEncryptionNotReady) {
 
 TEST_F(SyncManagerTest, EncryptDataTypesWithNoData) {
   EXPECT_TRUE(SetUpEncryption());
-  EXPECT_CALL(observer_, OnEncryptionComplete(GetAllRealModelTypes()));
+  EXPECT_CALL(observer_, OnEncryptionComplete(GetAllRealModelTypes(), true));
   sync_manager_.EnableEncryptEverything();
   EXPECT_TRUE(sync_manager_.EncryptEverythingEnabled());
 }
@@ -1262,7 +1263,7 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithData) {
                                                    false /* not encrypted */));
   }
 
-  EXPECT_CALL(observer_, OnEncryptionComplete(GetAllRealModelTypes()));
+  EXPECT_CALL(observer_, OnEncryptionComplete(GetAllRealModelTypes(), true));
   sync_manager_.EnableEncryptEverything();
   EXPECT_TRUE(sync_manager_.EncryptEverythingEnabled());
   {
@@ -1285,7 +1286,8 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithData) {
   // Trigger's a ReEncryptEverything with new passphrase.
   testing::Mock::VerifyAndClearExpectations(&observer_);
   EXPECT_CALL(observer_, OnPassphraseAccepted(_)).Times(1);
-  EXPECT_CALL(observer_, OnEncryptionComplete(GetAllRealModelTypes())).Times(1);
+  EXPECT_CALL(observer_,
+              OnEncryptionComplete(GetAllRealModelTypes(), true)).Times(1);
   sync_manager_.SetPassphrase("new_passphrase", true);
   EXPECT_TRUE(sync_manager_.EncryptEverythingEnabled());
   {
@@ -1309,7 +1311,8 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithData) {
   // TODO(zea): add logic to ensure nothing was written.
   testing::Mock::VerifyAndClearExpectations(&observer_);
   EXPECT_CALL(observer_, OnPassphraseAccepted(_)).Times(0);
-  EXPECT_CALL(observer_, OnEncryptionComplete(GetAllRealModelTypes())).Times(1);
+  EXPECT_CALL(observer_,
+              OnEncryptionComplete(GetAllRealModelTypes(), true)).Times(1);
   sync_manager_.EnableEncryptEverything();
 }
 
@@ -1328,7 +1331,7 @@ TEST_F(SyncManagerTest, SetPassphraseWithPassword) {
     password_node.SetPasswordSpecifics(data);
   }
   EXPECT_CALL(observer_, OnPassphraseAccepted(_));
-  EXPECT_CALL(observer_, OnEncryptionComplete(_));
+  EXPECT_CALL(observer_, OnEncryptionComplete(_, false));
   sync_manager_.SetPassphrase("new_passphrase", true);
   EXPECT_FALSE(sync_manager_.EncryptEverythingEnabled());
   {
@@ -1357,7 +1360,7 @@ TEST_F(SyncManagerTest, SetPassphraseWithEmptyPasswordNode) {
     node_id = password_node.GetId();
   }
   EXPECT_CALL(observer_, OnPassphraseAccepted(_));
-  EXPECT_CALL(observer_, OnEncryptionComplete(_));
+  EXPECT_CALL(observer_, OnEncryptionComplete(_, false));
   sync_manager_.SetPassphrase("new_passphrase", true);
   EXPECT_FALSE(sync_manager_.EncryptEverythingEnabled());
   {
@@ -1445,7 +1448,7 @@ TEST_F(SyncManagerTest, EncryptBookmarksWithLegacyData) {
                                                    false /* not encrypted */));
   }
 
-  EXPECT_CALL(observer_, OnEncryptionComplete(GetAllRealModelTypes()));
+  EXPECT_CALL(observer_, OnEncryptionComplete(GetAllRealModelTypes(), true));
   sync_manager_.EnableEncryptEverything();
   EXPECT_TRUE(sync_manager_.EncryptEverythingEnabled());