Chromium Code Reviews| 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 1879 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1890 // | 1890 // |
| 1891 // Note that these test names must be "GeolocationAPI" prefixed (b/c we mock out | 1891 // Note that these test names must be "GeolocationAPI" prefixed (b/c we mock out |
| 1892 // geolocation in this case). | 1892 // geolocation in this case). |
| 1893 // | 1893 // |
| 1894 // Also note that these are run separately because OverrideGeolocation() doesn't | 1894 // Also note that these are run separately because OverrideGeolocation() doesn't |
| 1895 // mock out geolocation for multiple navigator.geolocation calls properly and | 1895 // mock out geolocation for multiple navigator.geolocation calls properly and |
| 1896 // the tests become flaky. | 1896 // the tests become flaky. |
| 1897 // GeolocationAPI* test 1 of 3. | 1897 // GeolocationAPI* test 1 of 3. |
| 1898 IN_PROC_BROWSER_TEST_F(WebViewTest, GeolocationAPIEmbedderHasAccessAllow) { | 1898 IN_PROC_BROWSER_TEST_F(WebViewTest, GeolocationAPIEmbedderHasAccessAllow) { |
| 1899 TestHelper("testAllow", | 1899 TestHelper("testAllow", |
| 1900 "web_view/geolocation/embedder_has_permission", | 1900 "web_view/geolocation/embedder_has_permission", |
|
Michael van Ouwerkerk
2014/08/13 10:01:10
No need for this edit.
Miguel Garcia
2014/08/13 13:18:12
Acknowledged.
| |
| 1901 NEEDS_TEST_SERVER); | 1901 NEEDS_TEST_SERVER); |
| 1902 } | 1902 } |
| 1903 | 1903 |
| 1904 // GeolocationAPI* test 2 of 3. | 1904 // GeolocationAPI* test 2 of 3. |
| 1905 IN_PROC_BROWSER_TEST_F(WebViewTest, GeolocationAPIEmbedderHasAccessDeny) { | 1905 IN_PROC_BROWSER_TEST_F(WebViewTest, GeolocationAPIEmbedderHasAccessDeny) { |
| 1906 TestHelper("testDeny", | 1906 TestHelper("testDeny", |
| 1907 "web_view/geolocation/embedder_has_permission", | 1907 "web_view/geolocation/embedder_has_permission", |
| 1908 NEEDS_TEST_SERVER); | 1908 NEEDS_TEST_SERVER); |
| 1909 } | 1909 } |
| 1910 | 1910 |
| 1911 // GeolocationAPI* test 3 of 3. | 1911 // GeolocationAPI* test 3 of 3. |
| 1912 IN_PROC_BROWSER_TEST_F(WebViewTest, | 1912 IN_PROC_BROWSER_TEST_F(WebViewTest, |
| 1913 GeolocationAPIEmbedderHasAccessMultipleBridgeIdAllow) { | 1913 GeolocationAPIEmbedderHasAccessMultipleBridgeIdAllow) { |
| 1914 TestHelper("testMultipleBridgeIdAllow", | 1914 TestHelper("testMultipleBridgeIdAllow", |
| 1915 "web_view/geolocation/embedder_has_permission", | 1915 "web_view/geolocation/embedder_has_permission", |
| 1916 NEEDS_TEST_SERVER); | 1916 NEEDS_TEST_SERVER); |
| 1917 } | 1917 } |
| 1918 | 1918 |
| 1919 // Tests that | 1919 // Tests that |
| 1920 // BrowserPluginGeolocationPermissionContext::CancelGeolocationPermissionRequest | 1920 // BrowserPluginGeolocationPermissionContext::CancelGeolocationPermissionRequest |
| 1921 // is handled correctly (and does not crash). | 1921 // is handled correctly (and does not crash). |
| 1922 IN_PROC_BROWSER_TEST_F(WebViewTest, GeolocationAPICancelGeolocation) { | 1922 IN_PROC_BROWSER_TEST_F(WebViewTest, GeolocationAPICancelGeolocation) { |
|
Michael van Ouwerkerk
2014/08/13 10:01:10
Is this still working as intended?
Miguel Garcia
2014/08/13 13:18:12
It is yes, you should be able to cancel a geolocat
| |
| 1923 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. | 1923 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. |
| 1924 ASSERT_TRUE(RunPlatformAppTest( | 1924 ASSERT_TRUE(RunPlatformAppTest( |
| 1925 "platform_apps/web_view/geolocation/cancel_request")) << message_; | 1925 "platform_apps/web_view/geolocation/cancel_request")) << message_; |
| 1926 } | 1926 } |
| 1927 | 1927 |
| 1928 IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_GeolocationRequestGone) { | 1928 IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_GeolocationRequestGone) { |
| 1929 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. | 1929 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. |
| 1930 ASSERT_TRUE(RunPlatformAppTest( | 1930 ASSERT_TRUE(RunPlatformAppTest( |
| 1931 "platform_apps/web_view/geolocation/geolocation_request_gone")) | 1931 "platform_apps/web_view/geolocation/geolocation_request_gone")) |
| 1932 << message_; | 1932 << message_; |
| (...skipping 310 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 |