| Index: chrome/browser/in_process_webkit/dom_storage_uitest.cc
|
| ===================================================================
|
| --- chrome/browser/in_process_webkit/dom_storage_uitest.cc (revision 30539)
|
| +++ chrome/browser/in_process_webkit/dom_storage_uitest.cc (working copy)
|
| @@ -2,7 +2,6 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "build/build_config.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/test/automation/tab_proxy.h"
|
| #include "chrome/test/ui/ui_layout_test.h"
|
| @@ -103,13 +102,10 @@
|
| };
|
|
|
| // http://code.google.com/p/chromium/issues/detail?id=24145
|
| -// Remove build_config.h include when this is removed.
|
| #if defined(OS_WIN)
|
| -#define MAYBE_LocalStorageLayoutTests FLAKY_LocalStorageLayoutTests
|
| #define MAYBE_DOMStorageLayoutTests FLAKY_DOMStorageLayoutTests
|
| #define MAYBE_SessionStorageLayoutTests FLAKY_SessionStorageLayoutTests
|
| #else
|
| -#define MAYBE_LocalStorageLayoutTests LocalStorageLayoutTests
|
| #define MAYBE_DOMStorageLayoutTests DOMStorageLayoutTests
|
| #define MAYBE_SessionStorageLayoutTests SessionStorageLayoutTests
|
| #endif // defined(OS_WIN)
|
| @@ -122,7 +118,7 @@
|
| }
|
|
|
|
|
| -TEST_F(DOMStorageTest, MAYBE_LocalStorageLayoutTests) {
|
| +TEST_F(DOMStorageTest, FLAKY_LocalStorageLayoutTests) {
|
| InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("localstorage"),
|
| false);
|
| AddResources();
|
|
|