Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync / test / integration / multiple_client_dictionary_sync_test.cc

diff --git a/src/chrome/browser/sync/test/integration/multiple_client_dictionary_sync_test.cc b/src/chrome/browser/sync/test/integration/multiple_client_dictionary_sync_test.cc
index 424b492..1a8dec8 100644 (file)
--- a/src/chrome/browser/sync/test/integration/multiple_client_dictionary_sync_test.cc
+++ b/src/chrome/browser/sync/test/integration/multiple_client_dictionary_sync_test.cc
@@ -14,9 +14,9 @@ using chrome::spellcheck_common::MAX_SYNCABLE_DICTIONARY_WORDS;
 class MultipleClientDictionarySyncTest : public SyncTest {
  public:
   MultipleClientDictionarySyncTest() : SyncTest(MULTIPLE_CLIENT) {}
-  virtual ~MultipleClientDictionarySyncTest() {}
+  ~MultipleClientDictionarySyncTest() override {}
 
-  virtual bool TestUsesSelfNotifications() OVERRIDE { return false; }
+  bool TestUsesSelfNotifications() override { return false; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MultipleClientDictionarySyncTest);
@@ -56,7 +56,13 @@ IN_PROC_BROWSER_TEST_F(MultipleClientDictionarySyncTest, AddDifferentToAll) {
 
 // Tests the case where the Nth client pushes the server beyond its
 // MAX_SYNCABLE_DICTIONARY_WORDS limit.
-IN_PROC_BROWSER_TEST_F(MultipleClientDictionarySyncTest, Limit) {
+// Crashes on Windows. crbug.com/431354
+#if defined(OS_WIN)
+#define MAYBE_Limit DISABLED_Limit
+#else
+#define MAYBE_Limit Limit
+#endif
+IN_PROC_BROWSER_TEST_F(MultipleClientDictionarySyncTest, MAYBE_Limit) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   dictionary_helper::LoadDictionaries();
   ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch());