| 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/prerender/prerender_link_manager.h" | 10 #include "chrome/browser/prerender/prerender_link_manager.h" |
| (...skipping 888 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 899 SendMessageToEmbedder("show-guest"); | 899 SendMessageToEmbedder("show-guest"); |
| 900 GetGuestViewManager()->WaitForGuestCreated(); | 900 GetGuestViewManager()->WaitForGuestCreated(); |
| 901 EXPECT_TRUE(test_passed_listener.WaitUntilSatisfied()); | 901 EXPECT_TRUE(test_passed_listener.WaitUntilSatisfied()); |
| 902 } | 902 } |
| 903 | 903 |
| 904 // http://crbug.com/326332 | 904 // http://crbug.com/326332 |
| 905 IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_Shim_TestAutosizeAfterNavigation) { | 905 IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_Shim_TestAutosizeAfterNavigation) { |
| 906 TestHelper("testAutosizeAfterNavigation", "web_view/shim", NO_TEST_SERVER); | 906 TestHelper("testAutosizeAfterNavigation", "web_view/shim", NO_TEST_SERVER); |
| 907 } | 907 } |
| 908 | 908 |
| 909 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAllowTransparencyAttribute) { |
| 910 TestHelper("testAllowTransparencyAttribute", "web_view/shim", NO_TEST_SERVER); |
| 911 } |
| 912 |
| 909 IN_PROC_BROWSER_TEST_F(WebViewDPITest, Shim_TestAutosizeHeight) { | 913 IN_PROC_BROWSER_TEST_F(WebViewDPITest, Shim_TestAutosizeHeight) { |
| 910 TestHelper("testAutosizeHeight", "web_view/shim", NO_TEST_SERVER); | 914 TestHelper("testAutosizeHeight", "web_view/shim", NO_TEST_SERVER); |
| 911 } | 915 } |
| 912 | 916 |
| 913 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeHeight) { | 917 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeHeight) { |
| 914 TestHelper("testAutosizeHeight", "web_view/shim", NO_TEST_SERVER); | 918 TestHelper("testAutosizeHeight", "web_view/shim", NO_TEST_SERVER); |
| 915 } | 919 } |
| 916 | 920 |
| 917 IN_PROC_BROWSER_TEST_F(WebViewDPITest, Shim_TestAutosizeBeforeNavigation) { | 921 IN_PROC_BROWSER_TEST_F(WebViewDPITest, Shim_TestAutosizeBeforeNavigation) { |
| 918 TestHelper("testAutosizeBeforeNavigation", "web_view/shim", NO_TEST_SERVER); | 922 TestHelper("testAutosizeBeforeNavigation", "web_view/shim", NO_TEST_SERVER); |
| (...skipping 1425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2344 // http://crbug.com/403325 | 2348 // http://crbug.com/403325 |
| 2345 #define MAYBE_WebViewInBackgroundPage \ | 2349 #define MAYBE_WebViewInBackgroundPage \ |
| 2346 DISABLED_WebViewInBackgroundPage | 2350 DISABLED_WebViewInBackgroundPage |
| 2347 #else | 2351 #else |
| 2348 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage | 2352 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage |
| 2349 #endif | 2353 #endif |
| 2350 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { | 2354 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { |
| 2351 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) | 2355 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) |
| 2352 << message_; | 2356 << message_; |
| 2353 } | 2357 } |
| OLD | NEW |