Disable tab syncing when history saving is disabled.

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"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/single_client_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/common/pref_names.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "sync/protocol/sync_protocol_error.h"
@@ skipping 169 matching lines @@
   ASSERT_TRUE(AwaitSyncDisabled(GetSyncService((0))));
   ProfileSyncService::Status status;
   GetSyncService((0))->QueryDetailedSyncStatus(&status);
   ASSERT_EQ(status.sync_protocol_error.error_type, protocol_error.error_type);
   ASSERT_EQ(status.sync_protocol_error.action, protocol_error.action);
   ASSERT_EQ(status.sync_protocol_error.url, protocol_error.url);
   ASSERT_EQ(status.sync_protocol_error.error_description,
       protocol_error.error_description);
 }
 
-// TODO(lipalani): Fix the typed_url dtc so this test case can pass.
-IN_PROC_BROWSER_TEST_F(LegacySyncErrorTest,
-                       DISABLED_DisableDatatypeWhileRunning) {
+IN_PROC_BROWSER_TEST_F(LegacySyncErrorTest, DisableDatatypeWhileRunning) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   syncer::ModelTypeSet synced_datatypes =
-      GetSyncService((0))->GetPreferredDataTypes();
+      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);
 
-  synced_datatypes = GetSyncService((0))->GetPreferredDataTypes();
+  // 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