Context Menus now uses the JSON Schema Compiler.

chrome/browser/sync/test_profile_sync_service.cc

Index: chrome/browser/sync/test_profile_sync_service.cc
diff --git a/chrome/browser/sync/test_profile_sync_service.cc b/chrome/browser/sync/test_profile_sync_service.cc
index 063b8edd4cb67386b5a8412be6bcf9688cf43c6e..bf362675e40f56ab3f6a5c5955e6d004a798340d 100644
--- a/chrome/browser/sync/test_profile_sync_service.cc
+++ b/chrome/browser/sync/test_profile_sync_service.cc
@@ -105,7 +105,6 @@ void SyncBackendHostForProfileSyncTest
     syncer::ModelTypeSet restored_types) {
   // Here's our opportunity to pretend to do things that the SyncManager would
   // normally do during initialization, but can't because this is a test.
-  bool send_passphrase_required = false;

[not at google - send to devlin, 2012/07/31 06:53:09]

what's this change?

[chebert, 2012/08/02 23:56:40]

Whoops. This was so unittests would compile (this var doesn't do anything).
Deleting it.

On 2012/07/31 06:53:09, kalman wrote:

   if (success) {
     // Set up any nodes the test wants around before model association.
     if (!callback_.is_null()) {
@@ -121,10 +120,6 @@ void SyncBackendHostForProfileSyncTest
       if (!directory->initial_sync_ended_for_type(syncer::NIGORI)) {
         ProfileSyncServiceTestHelper::CreateRoot(
             syncer::NIGORI, user_share, &id_factory_);
-
-        // A side effect of adding the NIGORI mode (normally done by the
-        // syncer) is a decryption attempt, which will fail the first time.
-        send_passphrase_required = true;
       }
 
       SetInitialSyncEndedForAllTypes();