[Sync] Adjust types to configure during shutdown

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

Index: chrome/browser/sync/test/integration/sync_errors_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc
index 961af281193420701d63fee9b6c1e9d743fbcd9c..9e28f92ebcf9a4d62850044545d9bf4bbea1ba53 100644
--- a/chrome/browser/sync/test/integration/sync_errors_test.cc
+++ b/chrome/browser/sync/test/integration/sync_errors_test.cc
@@ -201,14 +201,8 @@ IN_PROC_BROWSER_TEST_F(SyncErrorTest, BirthdayErrorUsingActionableErrorTest) {
 }
 
 // Tests that on receiving CLIENT_DATA_OBSOLETE sync engine gets restarted and
-// initialized with different cache_guld.
-// Flaky on Windows and Linux. See crbug.com/683216
-#if defined(OS_WIN) || defined(OS_LINUX)
-#define MAYBE_ClientDataObsoleteTest DISABLED_ClientDataObsoleteTest
-#else
-#define MAYBE_ClientDataObsoleteTest ClientDataObsoleteTest
-#endif
-IN_PROC_BROWSER_TEST_F(SyncErrorTest, MAYBE_ClientDataObsoleteTest) {
+// initialized with different cache_guid.
+IN_PROC_BROWSER_TEST_F(SyncErrorTest, ClientDataObsoleteTest) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   const BookmarkNode* node1 = AddFolder(0, 0, "title1");