OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/stringprintf.h" | 5 #include "base/stringprintf.h" |
6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
7 #include "chrome/browser/automation/automation_util.h" | 7 #include "chrome/browser/automation/automation_util.h" |
8 #include "chrome/browser/extensions/extension_test_message_listener.h" | 8 #include "chrome/browser/extensions/extension_test_message_listener.h" |
9 #include "chrome/browser/extensions/platform_app_browsertest_util.h" | 9 #include "chrome/browser/extensions/platform_app_browsertest_util.h" |
10 #include "chrome/browser/prerender/prerender_link_manager.h" | 10 #include "chrome/browser/prerender/prerender_link_manager.h" |
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
487 &cookie_size, &cookie_value); | 487 &cookie_size, &cookie_value); |
488 EXPECT_EQ("persist1=true", cookie_value); | 488 EXPECT_EQ("persist1=true", cookie_value); |
489 automation_util::GetCookies(GURL("http://localhost"), | 489 automation_util::GetCookies(GURL("http://localhost"), |
490 persistent_partition_contents3, | 490 persistent_partition_contents3, |
491 &cookie_size, &cookie_value); | 491 &cookie_size, &cookie_value); |
492 EXPECT_EQ("persist2=true", cookie_value); | 492 EXPECT_EQ("persist2=true", cookie_value); |
493 } | 493 } |
494 | 494 |
495 // This is the post-reset portion of the StoragePersistence test. See | 495 // This is the post-reset portion of the StoragePersistence test. See |
496 // PRE_StoragePersistence for main comment. | 496 // PRE_StoragePersistence for main comment. |
497 IN_PROC_BROWSER_TEST_F(WebViewTest, StoragePersistence) { | 497 IN_PROC_BROWSER_TEST_F(WebViewTest, FLAKY_StoragePersistence) { |
498 ASSERT_TRUE(StartTestServer()); | 498 ASSERT_TRUE(StartTestServer()); |
499 | 499 |
500 // We don't care where the main browser is on this test. | 500 // We don't care where the main browser is on this test. |
501 GURL blank_url("about:blank"); | 501 GURL blank_url("about:blank"); |
502 | 502 |
503 // The first two partitions will be used to set cookies and ensure they are | 503 // The first two partitions will be used to set cookies and ensure they are |
504 // shared. The named partition is used to ensure that cookies are isolated | 504 // shared. The named partition is used to ensure that cookies are isolated |
505 // between partitions within the same app. | 505 // between partitions within the same app. |
506 content::WebContents* cookie_contents1; | 506 content::WebContents* cookie_contents1; |
507 content::WebContents* cookie_contents2; | 507 content::WebContents* cookie_contents2; |
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
853 #if defined(OS_WIN) && !defined(NDEBUG) | 853 #if defined(OS_WIN) && !defined(NDEBUG) |
854 #define MAYBE_NewWindow DISABLED_NewWindow | 854 #define MAYBE_NewWindow DISABLED_NewWindow |
855 #else | 855 #else |
856 #define MAYBE_NewWindow NewWindow | 856 #define MAYBE_NewWindow NewWindow |
857 #endif | 857 #endif |
858 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_NewWindow) { | 858 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_NewWindow) { |
859 ASSERT_TRUE(StartTestServer()); // For serving guest pages. | 859 ASSERT_TRUE(StartTestServer()); // For serving guest pages. |
860 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/newwindow")) | 860 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/newwindow")) |
861 << message_; | 861 << message_; |
862 } | 862 } |
OLD | NEW |