sync: don't send SYNC_CONFIGURE_DONE unless it is true

Adds a BLOCKED state to DataTypeManager to handle waiting on encryption.
Removes current_dtc_ from DTM because it's redundant.

(Note that DTMImpl will soon be obsoleted by Impl2)

BUG=76135,76233,76258
TEST=DataTypeManagerImpl[2]Test.*

Review URL: http://codereview.chromium.org/6697039

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

1 files changed, 0 insertions, 7 deletions

diff --git a/chrome/browser/sync/test_profile_sync_service.h b/chrome/browser/sync/test_profile_sync_service.h
index c027725..4c01473 100644
--- a/chrome/browser/sync/test_profile_sync_service.h
+++ b/chrome/browser/sync/test_profile_sync_service.h
@@ -36,8 +36,6 @@ class SyncBackendHostForProfileSyncTest
   //     completed setting itself up and called us back.
   SyncBackendHostForProfileSyncTest(
       Profile* profile,
-      int num_expected_resumes,
-      int num_expected_pauses,
       bool set_initial_sync_ended_on_init,
       bool synchronous_init);
   virtual ~SyncBackendHostForProfileSyncTest();
@@ -101,9 +99,6 @@ class TestProfileSyncService : public ProfileSyncService {
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  void set_num_expected_resumes(int times);
-  void set_num_expected_pauses(int num);
-
   // If this is called, configuring data types will require a syncer
   // nudge.
   void dont_set_initial_sync_ended_on_init();
@@ -133,8 +128,6 @@ class TestProfileSyncService : public ProfileSyncService {
   // step is performed synchronously.
   bool synchronous_sync_configuration_;
   bool set_expect_resume_expectations_;
-  int num_expected_resumes_;
-  int num_expected_pauses_;
 
   Task* initial_condition_setup_task_;
   bool set_initial_sync_ended_on_init_;