[Sync] Cache encrypted types info in ProfileSyncService

chrome/browser/sync/js/js_sync_manager_observer_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/js/js_sync_manager_observer.h"
 
 #include "base/basictypes.h"
 #include "base/location.h"
 #include "base/message_loop.h"
 #include "base/values.h"
@@ skipping 40 matching lines @@
                             HasDetails(JsEventDetails())));
   EXPECT_CALL(mock_js_event_handler_,
               HandleJsEvent("onStopSyncingPermanently",
                             HasDetails(JsEventDetails())));
   EXPECT_CALL(mock_js_event_handler_,
               HandleJsEvent("onClearServerDataSucceeded",
                             HasDetails(JsEventDetails())));
   EXPECT_CALL(mock_js_event_handler_,
               HandleJsEvent("onClearServerDataFailed",
                             HasDetails(JsEventDetails())));
+  EXPECT_CALL(mock_js_event_handler_,
+              HandleJsEvent("onEncryptionComplete",
+                            HasDetails(JsEventDetails())));
 
   js_sync_manager_observer_.OnInitializationComplete(WeakHandle<JsBackend>(),
       true);
   js_sync_manager_observer_.OnStopSyncingPermanently();
   js_sync_manager_observer_.OnClearServerDataSucceeded();
   js_sync_manager_observer_.OnClearServerDataFailed();
+  js_sync_manager_observer_.OnEncryptionComplete();
   PumpLoop();
 }
 
 TEST_F(JsSyncManagerObserverTest, OnSyncCycleCompleted) {
   std::string download_progress_markers[syncable::MODEL_TYPE_COUNT];
   sessions::SyncSessionSnapshot snapshot(sessions::SyncerStatus(),
                                          sessions::ErrorCounters(),
                                          100,
                                          false,
                                          syncable::ModelTypeBitSet(),
@@ skipping 106 matching lines @@
   EXPECT_CALL(mock_js_event_handler_,
               HandleJsEvent(
                   "onPassphraseAccepted",
                   HasDetailsAsDictionary(redacted_bootstrap_token_details)));
 
   js_sync_manager_observer_.OnUpdatedToken("sensitive_token");
   js_sync_manager_observer_.OnPassphraseAccepted("sensitive_token");
   PumpLoop();
 }
 
-TEST_F(JsSyncManagerObserverTest, OnEncryptionComplete) {
+TEST_F(JsSyncManagerObserverTest, OnEncryptedTypesChanged) {
   DictionaryValue expected_details;
   ListValue* encrypted_type_values = new ListValue();
+  const bool encrypt_everything = false;
   expected_details.Set("encryptedTypes", encrypted_type_values);
+  expected_details.SetBoolean("encryptEverything", encrypt_everything);
   syncable::ModelTypeSet encrypted_types;
 
   for (int i = syncable::FIRST_REAL_MODEL_TYPE;
        i < syncable::MODEL_TYPE_COUNT; ++i) {
     syncable::ModelType type = syncable::ModelTypeFromInt(i);
     encrypted_types.insert(type);
     encrypted_type_values->Append(Value::CreateStringValue(
         syncable::ModelTypeToString(type)));
   }
 
   EXPECT_CALL(mock_js_event_handler_,
-              HandleJsEvent("onEncryptionComplete",
+              HandleJsEvent("onEncryptedTypesChanged",
                            HasDetailsAsDictionary(expected_details)));

[Nicolas Zea, 2011/10/21 14:29:07]

indent

[akalin, 2011/10/22 03:28:38]

Done.

 
-  js_sync_manager_observer_.OnEncryptionComplete(encrypted_types);
+  js_sync_manager_observer_.OnEncryptedTypesChanged(
+      encrypted_types, encrypt_everything);
   PumpLoop();
 }
 
 }  // namespace
 }  // namespace browser_sync