Disable EditDictionaryWebUITest.testRemoveNotification on Win7

chrome/browser/ui/webui/options/edit_dictionary_browsertest.js

 // 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.
 
 GEN_INCLUDE(['options_browsertest_base.js']);
 
 /**
  * TestFixture for EditDictionaryOverlay WebUI testing.
  * @extends {testing.Test}
  * @constructor
@@ skipping 119 matching lines @@
   expectEquals(2, EditDictionaryOverlay.getWordListForTesting().items.length);
 
   // Backend notifies UI that the words 'bar' and 'baz' were added. UI shows
   // these new words.
   EditDictionaryOverlay.updateWords(['bar', 'baz'], []);
   expectEquals(4, EditDictionaryOverlay.getWordListForTesting().items.length);
 });
 
 // Verify that dictionary hides newly removed words that arrived in a
 // notification, but ignores duplicate remove notifications.
-TEST_F('EditDictionaryWebUITest', 'testRemoveNotification', function() {
+// TODO(crbug.com/631940): Flaky on Win 7.
+GEN('#if defined(OS_WIN)');
+GEN('#define MAYBE_testRemoveNotification DISABLED_testRemoveNotification');
+GEN('#else');
+GEN('#define MAYBE_testRemoveNotification testRemoveNotification');
+GEN('#endif  // defined(OS_WIN)');
+TEST_F('EditDictionaryWebUITest', 'MAYBE_testRemoveNotification', function() {
   // Begin with a dictionary with words 'foo', 'bar', 'baz', and 'baz'. The
   // second instance of 'baz' appears because the user added the word twice.
   // The backend keeps only one copy of the word.
   EditDictionaryOverlay.setWordList(['foo', 'bar', 'baz', 'baz']);
   expectEquals(5, EditDictionaryOverlay.getWordListForTesting().items.length);
 
   // User deletes the second instance of 'baz'.
   EditDictionaryOverlay.getWordListForTesting().deleteItemAtIndex(3);
   expectEquals(4, EditDictionaryOverlay.getWordListForTesting().items.length);
 
   // Backend notifies UI that the word 'baz' has been removed. UI ignores this
   // notification.
   EditDictionaryOverlay.updateWords([], ['baz']);
   expectEquals(4, EditDictionaryOverlay.getWordListForTesting().items.length);
 
   // Backend notifies UI that words 'foo' and 'bar' have been removed. UI
   // removes these words.
   EditDictionaryOverlay.updateWords([], ['foo', 'bar']);
   expectEquals(2, EditDictionaryOverlay.getWordListForTesting().items.length);
 });