| 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 1064 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1075 } | 1075 } |
| 1076 | 1076 |
| 1077 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestReload) { | 1077 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestReload) { |
| 1078 TestHelper("testReload", "web_view/shim", NEEDS_TEST_SERVER); | 1078 TestHelper("testReload", "web_view/shim", NEEDS_TEST_SERVER); |
| 1079 } | 1079 } |
| 1080 | 1080 |
| 1081 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestGetProcessId) { | 1081 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestGetProcessId) { |
| 1082 TestHelper("testGetProcessId", "web_view/shim", NEEDS_TEST_SERVER); | 1082 TestHelper("testGetProcessId", "web_view/shim", NEEDS_TEST_SERVER); |
| 1083 } | 1083 } |
| 1084 | 1084 |
| 1085 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestHiddenBeforeNavigation) { |
| 1086 TestHelper("testHiddenBeforeNavigation", "web_view/shim", NO_TEST_SERVER); |
| 1087 } |
| 1088 |
| 1085 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestRemoveWebviewOnExit) { | 1089 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestRemoveWebviewOnExit) { |
| 1086 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. | 1090 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. |
| 1087 | 1091 |
| 1088 // Launch the app and wait until it's ready to load a test. | 1092 // Launch the app and wait until it's ready to load a test. |
| 1089 ExtensionTestMessageListener launched_listener("Launched", false); | 1093 ExtensionTestMessageListener launched_listener("Launched", false); |
| 1090 LoadAndLaunchPlatformApp("web_view/shim"); | 1094 LoadAndLaunchPlatformApp("web_view/shim"); |
| 1091 ASSERT_TRUE(launched_listener.WaitUntilSatisfied()); | 1095 ASSERT_TRUE(launched_listener.WaitUntilSatisfied()); |
| 1092 | 1096 |
| 1093 content::WebContents* embedder_web_contents = GetFirstAppWindowWebContents(); | 1097 content::WebContents* embedder_web_contents = GetFirstAppWindowWebContents(); |
| 1094 ASSERT_TRUE(embedder_web_contents); | 1098 ASSERT_TRUE(embedder_web_contents); |
| (...skipping 1042 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2137 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { | 2141 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { |
| 2138 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); | 2142 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); |
| 2139 } | 2143 } |
| 2140 | 2144 |
| 2141 // <webview> screenshot capture fails with ubercomp. | 2145 // <webview> screenshot capture fails with ubercomp. |
| 2142 // See http://crbug.com/327035. | 2146 // See http://crbug.com/327035. |
| 2143 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, | 2147 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, |
| 2144 DISABLED_Shim_ScreenshotCapture) { | 2148 DISABLED_Shim_ScreenshotCapture) { |
| 2145 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); | 2149 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); |
| 2146 } | 2150 } |
| OLD | NEW |