Revert "[Sync] Move DataTypeStatusTable ownership into DataTypeManager."

chrome/browser/sync/test/integration/sync_errors_test.cc

 // Copyright (c) 2012 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 "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/passwords_helper.h"
@@ skipping 19 matching lines @@
   virtual bool IsExitConditionSatisfied() OVERRIDE {
     return !service()->setup_in_progress() &&
            !service()->HasSyncSetupCompleted();
   }
 
   virtual std::string GetDebugMessage() const OVERRIDE {
     return "Sync Disabled";
   }
 };
 
-class TypeDisabledChecker : public SingleClientStatusChangeChecker {
- public:
-  explicit TypeDisabledChecker(ProfileSyncService* service,
-                               syncer::ModelType type)
-      : SingleClientStatusChangeChecker(service), type_(type) {}
-
-  virtual bool IsExitConditionSatisfied() OVERRIDE {
-    return !service()->GetActiveDataTypes().Has(type_);
-  }
-
-  virtual std::string GetDebugMessage() const OVERRIDE {
-    return "Type disabled";
-  }
- private:
-   syncer::ModelType type_;
-};
-
 bool AwaitSyncDisabled(ProfileSyncService* service) {
   SyncDisabledChecker checker(service);
   checker.Wait();
   return !checker.TimedOut();
 }
 
-bool AwaitTypeDisabled(ProfileSyncService* service,
-                       syncer::ModelType type) {
-  TypeDisabledChecker checker(service, type);
-  checker.Wait();
-  return !checker.TimedOut();
-}
-
 class SyncErrorTest : public SyncTest {
  public:
   SyncErrorTest() : SyncTest(SINGLE_CLIENT) {}
   virtual ~SyncErrorTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SyncErrorTest);
 };
 
 // TODO(pvalenzuela): Remove this class when all tests here are converted to
@@ skipping 140 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(LegacySyncErrorTest, DisableDatatypeWhileRunning) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   syncer::ModelTypeSet synced_datatypes =
       GetSyncService((0))->GetActiveDataTypes();
   ASSERT_TRUE(synced_datatypes.Has(syncer::TYPED_URLS));
   ASSERT_TRUE(synced_datatypes.Has(syncer::SESSIONS));
   GetProfile(0)->GetPrefs()->SetBoolean(
       prefs::kSavingBrowserHistoryDisabled, true);
 
-  // Wait for reconfigurations.
-  ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::TYPED_URLS));
-  ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::SESSIONS));
+  // Flush any tasks posted by observers of the pref change.
+  base::RunLoop().RunUntilIdle();
+
+  synced_datatypes = GetSyncService((0))->GetActiveDataTypes();
+  ASSERT_FALSE(synced_datatypes.Has(syncer::TYPED_URLS));
+  ASSERT_FALSE(synced_datatypes.Has(syncer::SESSIONS));
 
   const BookmarkNode* node1 = AddFolder(0, 0, "title1");
   SetTitle(0, node1, "new_title1");
   ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
   // TODO(lipalani)" Verify initial sync ended for typed url is false.
 }
 
 }  // namespace