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

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

Issue 2561983002: NavigationController: Reload methods migration (Closed)
Patch Set: merge master Created 4 years 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
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 <queue> 5 #include <queue>
6 #include <set> 6 #include <set>
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 1078 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 1089
1090 // This test verifies that reloading the embedder reloads the guest (and doest 1090 // This test verifies that reloading the embedder reloads the guest (and doest
1091 // not crash). 1091 // not crash).
1092 IN_PROC_BROWSER_TEST_P(WebViewTest, ReloadEmbedder) { 1092 IN_PROC_BROWSER_TEST_P(WebViewTest, ReloadEmbedder) {
1093 // Just load a guest from other test, we do not want to add a separate 1093 // Just load a guest from other test, we do not want to add a separate
1094 // platform_app for this test. 1094 // platform_app for this test.
1095 LoadAppWithGuest("web_view/visibility_changed"); 1095 LoadAppWithGuest("web_view/visibility_changed");
1096 1096
1097 ExtensionTestMessageListener launched_again_listener("WebViewTest.LAUNCHED", 1097 ExtensionTestMessageListener launched_again_listener("WebViewTest.LAUNCHED",
1098 false); 1098 false);
1099 GetEmbedderWebContents()->GetController().Reload(false); 1099 GetEmbedderWebContents()->GetController().Reload(content::ReloadType::NORMAL,
1100 false);
1100 ASSERT_TRUE(launched_again_listener.WaitUntilSatisfied()); 1101 ASSERT_TRUE(launched_again_listener.WaitUntilSatisfied());
1101 } 1102 }
1102 1103
1103 IN_PROC_BROWSER_TEST_P(WebViewTest, AcceptTouchEvents) { 1104 IN_PROC_BROWSER_TEST_P(WebViewTest, AcceptTouchEvents) {
1104 // This test only makes sense for non-OOPIF WebView, since with 1105 // This test only makes sense for non-OOPIF WebView, since with
1105 // GuestViewCrossProcessFrames events are routed directly to the 1106 // GuestViewCrossProcessFrames events are routed directly to the
1106 // guest, so the embedder does not need to know about the installation of 1107 // guest, so the embedder does not need to know about the installation of
1107 // touch handlers. 1108 // touch handlers.
1108 if (base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames)) 1109 if (base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames))
1109 return; 1110 return;
(...skipping 2805 matching lines...) Expand 10 before | Expand all | Expand 10 after
3915 ClosingChromeSignInShouldNotCrash) { 3916 ClosingChromeSignInShouldNotCrash) {
3916 GURL signin_url{"chrome://chrome-signin"}; 3917 GURL signin_url{"chrome://chrome-signin"};
3917 3918
3918 AddTabAtIndex(0, signin_url, ui::PAGE_TRANSITION_TYPED); 3919 AddTabAtIndex(0, signin_url, ui::PAGE_TRANSITION_TYPED);
3919 AddTabAtIndex(1, signin_url, ui::PAGE_TRANSITION_TYPED); 3920 AddTabAtIndex(1, signin_url, ui::PAGE_TRANSITION_TYPED);
3920 WaitForWebViewInDom(); 3921 WaitForWebViewInDom();
3921 3922
3922 chrome::CloseTab(browser()); 3923 chrome::CloseTab(browser());
3923 } 3924 }
3924 #endif 3925 #endif
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/vr_shell.cc ('k') | chrome/browser/autofill/autofill_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698