OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "apps/ui/native_app_window.h" | 5 #include "apps/ui/native_app_window.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
10 #include "chrome/browser/apps/app_browsertest_util.h" | 10 #include "chrome/browser/apps/app_browsertest_util.h" |
(...skipping 1442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1453 &cookie_size, &cookie_value); | 1453 &cookie_size, &cookie_value); |
1454 EXPECT_EQ("persist1=true", cookie_value); | 1454 EXPECT_EQ("persist1=true", cookie_value); |
1455 ui_test_utils::GetCookies(GURL("http://localhost"), | 1455 ui_test_utils::GetCookies(GURL("http://localhost"), |
1456 persistent_partition_contents3, | 1456 persistent_partition_contents3, |
1457 &cookie_size, &cookie_value); | 1457 &cookie_size, &cookie_value); |
1458 EXPECT_EQ("persist2=true", cookie_value); | 1458 EXPECT_EQ("persist2=true", cookie_value); |
1459 } | 1459 } |
1460 | 1460 |
1461 // This is the post-reset portion of the StoragePersistence test. See | 1461 // This is the post-reset portion of the StoragePersistence test. See |
1462 // PRE_StoragePersistence for main comment. | 1462 // PRE_StoragePersistence for main comment. |
1463 IN_PROC_BROWSER_TEST_F(WebViewTest, StoragePersistence) { | 1463 #if defined(OS_CHROMEOS) |
| 1464 // http://crbug.com/223888 |
| 1465 #define MAYBE_StoragePersistence DISABLED_StoragePersistence |
| 1466 #else |
| 1467 #define MAYBE_StoragePersistence StoragePersistence |
| 1468 #endif |
| 1469 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_StoragePersistence) { |
1464 ASSERT_TRUE(StartEmbeddedTestServer()); | 1470 ASSERT_TRUE(StartEmbeddedTestServer()); |
1465 | 1471 |
1466 // We don't care where the main browser is on this test. | 1472 // We don't care where the main browser is on this test. |
1467 GURL blank_url("about:blank"); | 1473 GURL blank_url("about:blank"); |
1468 | 1474 |
1469 // The first two partitions will be used to set cookies and ensure they are | 1475 // The first two partitions will be used to set cookies and ensure they are |
1470 // shared. The named partition is used to ensure that cookies are isolated | 1476 // shared. The named partition is used to ensure that cookies are isolated |
1471 // between partitions within the same app. | 1477 // between partitions within the same app. |
1472 content::WebContents* cookie_contents1; | 1478 content::WebContents* cookie_contents1; |
1473 content::WebContents* cookie_contents2; | 1479 content::WebContents* cookie_contents2; |
(...skipping 765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2239 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { | 2245 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { |
2240 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); | 2246 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); |
2241 } | 2247 } |
2242 | 2248 |
2243 // <webview> screenshot capture fails with ubercomp. | 2249 // <webview> screenshot capture fails with ubercomp. |
2244 // See http://crbug.com/327035. | 2250 // See http://crbug.com/327035. |
2245 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, | 2251 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, |
2246 DISABLED_Shim_ScreenshotCapture) { | 2252 DISABLED_Shim_ScreenshotCapture) { |
2247 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); | 2253 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); |
2248 } | 2254 } |
OLD | NEW |