First half of http://codereview.chromium.org/274014/show...

chrome/browser/in_process_webkit/dom_storage_uitest.cc

 // Copyright (c) 2009 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 "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_layout_test.h"
 
 // TODO(jorlow): Enable all of these tests, eventually...
 static const char* kEventsFiles[] = {
@@ skipping 65 matching lines @@
 
   // This is somewhat of a hack because we're running a real browser that
   // actually persists the LocalStorage state vs. DRT and TestShell which don't.
   // The correct fix is to fix the LayoutTests, but similar patches have been
   // rejected in the past.
   void ClearDOMStorage() {
     scoped_refptr<TabProxy> tab(GetActiveTab());
     ASSERT_TRUE(tab.get());
 
     GURL url = GetTestUrl(L"layout_tests", L"clear_dom_storage.html");
+    tab->SetCookie(url, "");
     ASSERT_TRUE(tab->NavigateToURL(url));
 
     WaitUntilCookieNonEmpty(tab.get(), url, "cleared", kTestIntervalMs,
                             kTestWaitTimeoutMs);
   }
 
   // Runs each test in an array of strings until it hits a NULL.
   void RunTests(const char** files) {
     while (*files) {
       ClearDOMStorage();
       RunLayoutTest(*files, false);
       ++files;
     }
   }
 
   FilePath test_dir_;
 };
 
-// http://code.google.com/p/chromium/issues/detail?id=24145
-#if defined(OS_WIN)
-#define MAYBE_DOMStorageLayoutTests FLAKY_DOMStorageLayoutTests
-#define MAYBE_SessionStorageLayoutTests FLAKY_SessionStorageLayoutTests
-#else
-#define MAYBE_DOMStorageLayoutTests DOMStorageLayoutTests
-#define MAYBE_SessionStorageLayoutTests SessionStorageLayoutTests
-#endif  // defined(OS_WIN)
 
-
-TEST_F(DOMStorageTest, MAYBE_DOMStorageLayoutTests) {
+TEST_F(DOMStorageTest, DOMStorageLayoutTests) {
   InitializeForLayoutTest(test_dir_, FilePath(), false);
   AddResources();
   RunTests(kTopLevelFiles);
 }
 
 
-TEST_F(DOMStorageTest, FLAKY_LocalStorageLayoutTests) {
+TEST_F(DOMStorageTest, LocalStorageLayoutTests) {
   InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("localstorage"),
                           false);
   AddResources();
   RunTests(kNoEventsFiles);
   RunTests(kEventsFiles);
   RunTests(kLocalStorageFiles);
 }
 
-TEST_F(DOMStorageTest, MAYBE_SessionStorageLayoutTests) {
+TEST_F(DOMStorageTest, SessionStorageLayoutTests) {
   InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("sessionstorage"),
                           false);
   AddResources();
   RunTests(kNoEventsFiles);
   //RunTests(kEventsFiles);
   RunTests(kSessionStorageFiles);
 }