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

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

Issue 67403005: Re-enable Shim_TestAssignSrcAfterCrash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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 | no next file » | 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/browser/apps/app_browsertest_util.h" 9 #include "chrome/browser/apps/app_browsertest_util.h"
10 #include "chrome/browser/automation/automation_util.h" 10 #include "chrome/browser/automation/automation_util.h"
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 } 741 }
742 742
743 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestExecuteScript) { 743 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestExecuteScript) {
744 TestHelper("testExecuteScript", "web_view/shim", NO_TEST_SERVER); 744 TestHelper("testExecuteScript", "web_view/shim", NO_TEST_SERVER);
745 } 745 }
746 746
747 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestTerminateAfterExit) { 747 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestTerminateAfterExit) {
748 TestHelper("testTerminateAfterExit", "web_view/shim", NO_TEST_SERVER); 748 TestHelper("testTerminateAfterExit", "web_view/shim", NO_TEST_SERVER);
749 } 749 }
750 750
751 // Disabled due to flakiness. http://crbug.com/316939 751 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAssignSrcAfterCrash) {
752 IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_Shim_TestAssignSrcAfterCrash) {
753 TestHelper("testAssignSrcAfterCrash", "web_view/shim", NO_TEST_SERVER); 752 TestHelper("testAssignSrcAfterCrash", "web_view/shim", NO_TEST_SERVER);
754 } 753 }
755 754
756 IN_PROC_BROWSER_TEST_F(WebViewTest, 755 IN_PROC_BROWSER_TEST_F(WebViewTest,
757 Shim_TestNavOnConsecutiveSrcAttributeChanges) { 756 Shim_TestNavOnConsecutiveSrcAttributeChanges) {
758 TestHelper("testNavOnConsecutiveSrcAttributeChanges", 757 TestHelper("testNavOnConsecutiveSrcAttributeChanges",
759 "web_view/shim", 758 "web_view/shim",
760 NO_TEST_SERVER); 759 NO_TEST_SERVER);
761 } 760 }
762 761
(...skipping 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after
1791 pepper_plugin.append(FILE_PATH_LITERAL(";application/x-ppapi-tests")); 1790 pepper_plugin.append(FILE_PATH_LITERAL(";application/x-ppapi-tests"));
1792 command_line->AppendSwitchNative(switches::kRegisterPepperPlugins, 1791 command_line->AppendSwitchNative(switches::kRegisterPepperPlugins,
1793 pepper_plugin); 1792 pepper_plugin);
1794 } 1793 }
1795 }; 1794 };
1796 1795
1797 IN_PROC_BROWSER_TEST_F(WebViewPluginTest, TestLoadPluginEvent) { 1796 IN_PROC_BROWSER_TEST_F(WebViewPluginTest, TestLoadPluginEvent) {
1798 TestHelper("testPluginLoadPermission", "web_view/shim", NO_TEST_SERVER); 1797 TestHelper("testPluginLoadPermission", "web_view/shim", NO_TEST_SERVER);
1799 } 1798 }
1800 #endif // defined(ENABLE_PLUGINS) 1799 #endif // defined(ENABLE_PLUGINS)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698