| 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/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
| 10 #include "chrome/browser/chrome_content_browser_client.h" | 10 #include "chrome/browser/chrome_content_browser_client.h" |
| (...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 846 } | 846 } |
| 847 | 847 |
| 848 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeBeforeNavigation) { | 848 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeBeforeNavigation) { |
| 849 TestHelper("testAutosizeBeforeNavigation", "web_view/shim", NO_TEST_SERVER); | 849 TestHelper("testAutosizeBeforeNavigation", "web_view/shim", NO_TEST_SERVER); |
| 850 } | 850 } |
| 851 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeRemoveAttributes) { | 851 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeRemoveAttributes) { |
| 852 TestHelper("testAutosizeRemoveAttributes", "web_view/shim", NO_TEST_SERVER); | 852 TestHelper("testAutosizeRemoveAttributes", "web_view/shim", NO_TEST_SERVER); |
| 853 } | 853 } |
| 854 | 854 |
| 855 // This test is disabled due to being flaky. http://crbug.com/282116 | 855 // This test is disabled due to being flaky. http://crbug.com/282116 |
| 856 #if defined(OS_WIN) | 856 #if defined(OS_WIN) || defined(OS_MACOSX) |
| 857 #define MAYBE_Shim_TestAutosizeWithPartialAttributes \ | 857 #define MAYBE_Shim_TestAutosizeWithPartialAttributes \ |
| 858 DISABLED_Shim_TestAutosizeWithPartialAttributes | 858 DISABLED_Shim_TestAutosizeWithPartialAttributes |
| 859 #else | 859 #else |
| 860 #define MAYBE_Shim_TestAutosizeWithPartialAttributes \ | 860 #define MAYBE_Shim_TestAutosizeWithPartialAttributes \ |
| 861 Shim_TestAutosizeWithPartialAttributes | 861 Shim_TestAutosizeWithPartialAttributes |
| 862 #endif | 862 #endif |
| 863 IN_PROC_BROWSER_TEST_F(WebViewTest, | 863 IN_PROC_BROWSER_TEST_F(WebViewTest, |
| 864 MAYBE_Shim_TestAutosizeWithPartialAttributes) { | 864 MAYBE_Shim_TestAutosizeWithPartialAttributes) { |
| 865 TestHelper("testAutosizeWithPartialAttributes", | 865 TestHelper("testAutosizeWithPartialAttributes", |
| 866 "web_view/shim", | 866 "web_view/shim", |
| (...skipping 1376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2243 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { | 2243 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { |
| 2244 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); | 2244 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); |
| 2245 } | 2245 } |
| 2246 | 2246 |
| 2247 // <webview> screenshot capture fails with ubercomp. | 2247 // <webview> screenshot capture fails with ubercomp. |
| 2248 // See http://crbug.com/327035. | 2248 // See http://crbug.com/327035. |
| 2249 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, | 2249 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, |
| 2250 DISABLED_Shim_ScreenshotCapture) { | 2250 DISABLED_Shim_ScreenshotCapture) { |
| 2251 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); | 2251 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); |
| 2252 } | 2252 } |
| OLD | NEW |