| 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 "base/path_service.h" | 5 #include "base/path_service.h" |
| 6 #include "base/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "chrome/browser/apps/app_browsertest_util.h" | 8 #include "chrome/browser/apps/app_browsertest_util.h" |
| 9 #include "chrome/browser/chrome_content_browser_client.h" | 9 #include "chrome/browser/chrome_content_browser_client.h" |
| 10 #include "chrome/browser/extensions/extension_test_message_listener.h" | 10 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| (...skipping 876 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 887 SendMessageToEmbedder("show-guest"); | 887 SendMessageToEmbedder("show-guest"); |
| 888 GetGuestViewManager()->WaitForGuestCreated(); | 888 GetGuestViewManager()->WaitForGuestCreated(); |
| 889 EXPECT_TRUE(test_passed_listener.WaitUntilSatisfied()); | 889 EXPECT_TRUE(test_passed_listener.WaitUntilSatisfied()); |
| 890 } | 890 } |
| 891 | 891 |
| 892 // http://crbug.com/326332 | 892 // http://crbug.com/326332 |
| 893 IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_Shim_TestAutosizeAfterNavigation) { | 893 IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_Shim_TestAutosizeAfterNavigation) { |
| 894 TestHelper("testAutosizeAfterNavigation", "web_view/shim", NO_TEST_SERVER); | 894 TestHelper("testAutosizeAfterNavigation", "web_view/shim", NO_TEST_SERVER); |
| 895 } | 895 } |
| 896 | 896 |
| 897 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeHeight) { |
| 898 TestHelper("testAutosizeHeight", "web_view/shim", NO_TEST_SERVER); |
| 899 } |
| 900 |
| 897 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeBeforeNavigation) { | 901 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeBeforeNavigation) { |
| 898 TestHelper("testAutosizeBeforeNavigation", "web_view/shim", NO_TEST_SERVER); | 902 TestHelper("testAutosizeBeforeNavigation", "web_view/shim", NO_TEST_SERVER); |
| 899 } | 903 } |
| 900 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeRemoveAttributes) { | 904 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeRemoveAttributes) { |
| 901 TestHelper("testAutosizeRemoveAttributes", "web_view/shim", NO_TEST_SERVER); | 905 TestHelper("testAutosizeRemoveAttributes", "web_view/shim", NO_TEST_SERVER); |
| 902 } | 906 } |
| 903 | 907 |
| 904 // This test is disabled due to being flaky. http://crbug.com/282116 | 908 // This test is disabled due to being flaky. http://crbug.com/282116 |
| 905 #if defined(OS_WIN) || defined(OS_MACOSX) | 909 #if defined(OS_WIN) || defined(OS_MACOSX) |
| 906 #define MAYBE_Shim_TestAutosizeWithPartialAttributes \ | 910 #define MAYBE_Shim_TestAutosizeWithPartialAttributes \ |
| (...skipping 1398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2305 // http://crbug.com/403325 | 2309 // http://crbug.com/403325 |
| 2306 #define MAYBE_WebViewInBackgroundPage \ | 2310 #define MAYBE_WebViewInBackgroundPage \ |
| 2307 DISABLED_WebViewInBackgroundPage | 2311 DISABLED_WebViewInBackgroundPage |
| 2308 #else | 2312 #else |
| 2309 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage | 2313 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage |
| 2310 #endif | 2314 #endif |
| 2311 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { | 2315 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { |
| 2312 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) | 2316 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) |
| 2313 << message_; | 2317 << message_; |
| 2314 } | 2318 } |
| OLD | NEW |