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

Side by Side Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 261623004: Hook prerender into non-CURRENT_TAB dispositions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/browser_navigator.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <deque> 5 #include <deque>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 3217 matching lines...) Expand 10 before | Expand all | Expand 10 after
3228 1); 3228 1);
3229 OpenDestURLViaClick(); 3229 OpenDestURLViaClick();
3230 NavigateToNextPageAfterPrerender(); 3230 NavigateToNextPageAfterPrerender();
3231 GoBackToPrerender(); 3231 GoBackToPrerender();
3232 } 3232 }
3233 3233
3234 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewWindow) { 3234 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewWindow) {
3235 // Prerender currently doesn't interpose on this navigation. 3235 // Prerender currently doesn't interpose on this navigation.
3236 // http://crbug.com/345474. 3236 // http://crbug.com/345474.
3237 PrerenderTestURL("files/prerender/prerender_page_with_link.html", 3237 PrerenderTestURL("files/prerender/prerender_page_with_link.html",
3238 FINAL_STATUS_APP_TERMINATING, 3238 FINAL_STATUS_USED,
3239 1); 3239 1);
3240 OpenDestURLViaClickNewWindow(); 3240 OpenDestURLViaClickNewWindow();
3241 } 3241 }
3242 3242
3243 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewForegroundTab) { 3243 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewForegroundTab) {
3244 // Prerender currently doesn't interpose on this navigation. 3244 // Prerender currently doesn't interpose on this navigation.
3245 // http://crbug.com/345474. 3245 // http://crbug.com/345474.
3246 PrerenderTestURL("files/prerender/prerender_page_with_link.html", 3246 PrerenderTestURL("files/prerender/prerender_page_with_link.html",
3247 FINAL_STATUS_APP_TERMINATING, 3247 FINAL_STATUS_USED,
3248 1); 3248 1);
3249 OpenDestURLViaClickNewForegroundTab(); 3249 OpenDestURLViaClickNewForegroundTab();
3250 } 3250 }
3251 3251
3252 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewBackgroundTab) { 3252 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewBackgroundTab) {
3253 // Prerender currently doesn't interpose on this navigation. 3253 // Prerender currently doesn't interpose on this navigation.
3254 // http://crbug.com/345474. 3254 // http://crbug.com/345474.
3255 scoped_ptr<TestPrerender> prerender = 3255 scoped_ptr<TestPrerender> prerender =
3256 PrerenderTestURL("files/prerender/prerender_page_with_link.html", 3256 PrerenderTestURL("files/prerender/prerender_page_with_link.html",
3257 FINAL_STATUS_APP_TERMINATING, 3257 FINAL_STATUS_USED,
3258 1); 3258 1);
3259 ASSERT_TRUE(prerender->contents()); 3259 ASSERT_TRUE(prerender->contents());
3260 prerender->contents()->set_should_be_shown(false); 3260 prerender->contents()->set_should_be_shown(false);
3261 OpenDestURLViaClickNewBackgroundTab(); 3261 OpenDestURLViaClickNewBackgroundTab();
3262 } 3262 }
3263 3263
3264 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, 3264 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
3265 NavigateToPrerenderedPageWhenDevToolsAttached) { 3265 NavigateToPrerenderedPageWhenDevToolsAttached) {
3266 DisableJavascriptCalls(); 3266 DisableJavascriptCalls();
3267 WebContents* web_contents = 3267 WebContents* web_contents =
(...skipping 990 matching lines...) Expand 10 before | Expand all | Expand 10 after
4258 4258
4259 // Navigate to the URL entered. 4259 // Navigate to the URL entered.
4260 omnibox_view->model()->AcceptInput(CURRENT_TAB, false); 4260 omnibox_view->model()->AcceptInput(CURRENT_TAB, false);
4261 4261
4262 // Prerender should be running, but abandoned. 4262 // Prerender should be running, but abandoned.
4263 EXPECT_TRUE( 4263 EXPECT_TRUE(
4264 GetAutocompleteActionPredictor()->IsPrerenderAbandonedForTesting()); 4264 GetAutocompleteActionPredictor()->IsPrerenderAbandonedForTesting());
4265 } 4265 }
4266 4266
4267 } // namespace prerender 4267 } // namespace prerender
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser_navigator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698