Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(459)

Side by Side Diff: chrome/browser/apps/web_view_browsertest.cc

Issue 310963002: Fix a possible race in WebViewTest.Shim_TestPartitionRaisesException. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/test/data/extensions/platform_apps/web_view/shim/main.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 891 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 // WebViewTest.Shim_TestDestroyOnEventListener is flaky, so disable it. 902 // WebViewTest.Shim_TestDestroyOnEventListener is flaky, so disable it.
903 // http://crbug.com/255106 903 // http://crbug.com/255106
904 IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_Shim_TestDestroyOnEventListener) { 904 IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_Shim_TestDestroyOnEventListener) {
905 TestHelper("testDestroyOnEventListener", "web_view/shim", NO_TEST_SERVER); 905 TestHelper("testDestroyOnEventListener", "web_view/shim", NO_TEST_SERVER);
906 } 906 }
907 907
908 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestCannotMutateEventName) { 908 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestCannotMutateEventName) {
909 TestHelper("testCannotMutateEventName", "web_view/shim", NO_TEST_SERVER); 909 TestHelper("testCannotMutateEventName", "web_view/shim", NO_TEST_SERVER);
910 } 910 }
911 911
912 // http://crbug.com/267304 912 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestPartitionRaisesException) {
913 #if defined(OS_WIN) 913 TestHelper("testPartitionRaisesException", "web_view/shim", NO_TEST_SERVER);
914 #define MAYBE_Shim_TestPartitionRaisesException \
915 DISABLED_Shim_TestPartitionRaisesException
916 #else
917 #define MAYBE_Shim_TestPartitionRaisesException \
918 Shim_TestPartitionRaisesException
919 #endif
920
921 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_Shim_TestPartitionRaisesException) {
922 TestHelper("testPartitionRaisesException",
923 "web_view/shim",
924 NO_TEST_SERVER);
925 } 914 }
926 915
927 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestExecuteScriptFail) { 916 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestExecuteScriptFail) {
928 #if defined(OS_WIN) 917 #if defined(OS_WIN)
929 // Flaky on XP bot http://crbug.com/266185 918 // Flaky on XP bot http://crbug.com/266185
930 if (base::win::GetVersion() <= base::win::VERSION_XP) 919 if (base::win::GetVersion() <= base::win::VERSION_XP)
931 return; 920 return;
932 #endif 921 #endif
933 922
934 TestHelper("testExecuteScriptFail", "web_view/shim", NEEDS_TEST_SERVER); 923 TestHelper("testExecuteScriptFail", "web_view/shim", NEEDS_TEST_SERVER);
(...skipping 1222 matching lines...) Expand 10 before | Expand all | Expand 10 after
2157 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { 2146 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) {
2158 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); 2147 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER);
2159 } 2148 }
2160 2149
2161 // <webview> screenshot capture fails with ubercomp. 2150 // <webview> screenshot capture fails with ubercomp.
2162 // See http://crbug.com/327035. 2151 // See http://crbug.com/327035.
2163 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, 2152 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest,
2164 DISABLED_Shim_ScreenshotCapture) { 2153 DISABLED_Shim_ScreenshotCapture) {
2165 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); 2154 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER);
2166 } 2155 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/data/extensions/platform_apps/web_view/shim/main.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698