Re-enable some disabled WebView tests.

chrome/browser/apps/web_view_browsertest.cc

 // Copyright 2013 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 "apps/ui/native_app_window.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
@@ skipping 1258 matching lines @@
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyWebView()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyApp()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyBackground()));
 }
 
 // This tests cookie isolation for packaged apps with webview tags. It navigates
 // the main browser window to a page that sets a cookie and loads an app with
 // multiple webview tags. Each tag sets a cookie and the test checks the proper
 // storage isolation is enforced.
-// This test is disabled due to being flaky. http://crbug.com/294196
-#if defined(OS_WIN)
-#define MAYBE_CookieIsolation DISABLED_CookieIsolation
-#else
-#define MAYBE_CookieIsolation CookieIsolation
-#endif
-IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_CookieIsolation) {
+IN_PROC_BROWSER_TEST_F(WebViewTest, CookieIsolation) {
   ASSERT_TRUE(StartEmbeddedTestServer());
   const std::string kExpire =
       "var expire = new Date(Date.now() + 24 * 60 * 60 * 1000);";
   std::string cookie_script1(kExpire);
   cookie_script1.append(
       "document.cookie = 'guest1=true; path=/; expires=' + expire + ';';");
   std::string cookie_script2(kExpire);
   cookie_script2.append(
       "document.cookie = 'guest2=true; path=/; expires=' + expire + ';';");
 
@@ skipping 130 matching lines @@
                             &cookie_size, &cookie_value);
   EXPECT_EQ("persist1=true", cookie_value);
   ui_test_utils::GetCookies(GURL("http://localhost"),
                             persistent_partition_contents3,
                             &cookie_size, &cookie_value);
   EXPECT_EQ("persist2=true", cookie_value);
 }
 
 // This is the post-reset portion of the StoragePersistence test.  See
 // PRE_StoragePersistence for main comment.
-IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_StoragePersistence) {
+IN_PROC_BROWSER_TEST_F(WebViewTest, StoragePersistence) {
   ASSERT_TRUE(StartEmbeddedTestServer());
 
   // We don't care where the main browser is on this test.
   GURL blank_url("about:blank");
 
   // The first two partitions will be used to set cookies and ensure they are
   // shared. The named partition is used to ensure that cookies are isolated
   // between partitions within the same app.
   content::WebContents* cookie_contents1;
   content::WebContents* cookie_contents2;
@@ skipping 38 matching lines @@
   ui_test_utils::GetCookies(GURL("http://localhost"),
                             persistent_partition_contents2,
                             &cookie_size, &cookie_value);
   EXPECT_EQ("persist1=true", cookie_value);
   ui_test_utils::GetCookies(GURL("http://localhost"),
                             persistent_partition_contents3,
                             &cookie_size, &cookie_value);
   EXPECT_EQ("persist2=true", cookie_value);
 }
 
-#if defined(OS_WIN)
-// This test is very flaky on Win Aura, Win XP, Win 7. http://crbug.com/248873
-#define MAYBE_DOMStorageIsolation DISABLED_DOMStorageIsolation
-#else
-#define MAYBE_DOMStorageIsolation DOMStorageIsolation
-#endif
-
 // This tests DOM storage isolation for packaged apps with webview tags. It
 // loads an app with multiple webview tags and each tag sets DOM storage
 // entries, which the test checks to ensure proper storage isolation is
 // enforced.
-IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_DOMStorageIsolation) {
+IN_PROC_BROWSER_TEST_F(WebViewTest, DOMStorageIsolation) {
   ASSERT_TRUE(StartEmbeddedTestServer());
   GURL regular_url = embedded_test_server()->GetURL("/title1.html");
 
   std::string output;
   std::string get_local_storage("window.domAutomationController.send("
       "window.localStorage.getItem('foo') || 'badval')");
   std::string get_session_storage("window.domAutomationController.send("
       "window.sessionStorage.getItem('bar') || 'badval')");
 
   content::WebContents* default_tag_contents1;
@@ skipping 63 matching lines @@
   EXPECT_TRUE(ExecuteScriptAndExtractString(default_tag_contents1,
                                             get_local_storage.c_str(),
                                             &output));
   EXPECT_STREQ("badval", output.c_str());
   EXPECT_TRUE(ExecuteScriptAndExtractString(default_tag_contents1,
                                             get_session_storage.c_str(),
                                             &output));
   EXPECT_STREQ("badval", output.c_str());
 }
 
-// See crbug.com/248500
-#if defined(OS_WIN)
-#define MAYBE_IndexedDBIsolation DISABLED_IndexedDBIsolation
-#else
-#define MAYBE_IndexedDBIsolation IndexedDBIsolation
-#endif
-
 // This tests IndexedDB isolation for packaged apps with webview tags. It loads
 // an app with multiple webview tags and each tag creates an IndexedDB record,
 // which the test checks to ensure proper storage isolation is enforced.
-IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_IndexedDBIsolation) {
+IN_PROC_BROWSER_TEST_F(WebViewTest, IndexedDBIsolation) {
   ASSERT_TRUE(StartEmbeddedTestServer());
   GURL regular_url = embedded_test_server()->GetURL("/title1.html");
 
   content::WebContents* default_tag_contents1;
   content::WebContents* default_tag_contents2;
   content::WebContents* storage_contents1;
   content::WebContents* storage_contents2;
 
   NavigateAndOpenAppForIsolation(regular_url, &default_tag_contents1,
                                  &default_tag_contents2, &storage_contents1,
@@ skipping 553 matching lines @@
 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) {
   TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER);
 }
 
 // <webview> screenshot capture fails with ubercomp.
 // See http://crbug.com/327035.
 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest,
                        DISABLED_Shim_ScreenshotCapture) {
   TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER);
 }