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

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

Issue 133993003: Remove prerender::Config::https_allowed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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/prerender/prerender_config.h » ('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 1255 matching lines...) Expand 10 before | Expand all | Expand 10 after
1266 base::FilePath(FILE_PATH_LITERAL("chrome/test/data")))); 1266 base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))));
1267 ASSERT_TRUE(https_src_server->Start()); 1267 ASSERT_TRUE(https_src_server->Start());
1268 src_server = https_src_server.get(); 1268 src_server = https_src_server.get();
1269 } 1269 }
1270 GURL loader_url = src_server->GetURL(replacement_path + 1270 GURL loader_url = src_server->GetURL(replacement_path +
1271 loader_query_and_fragment_); 1271 loader_query_and_fragment_);
1272 1272
1273 PrerenderManager* prerender_manager = GetPrerenderManager(); 1273 PrerenderManager* prerender_manager = GetPrerenderManager();
1274 ASSERT_TRUE(prerender_manager); 1274 ASSERT_TRUE(prerender_manager);
1275 prerender_manager->mutable_config().rate_limit_enabled = false; 1275 prerender_manager->mutable_config().rate_limit_enabled = false;
1276 prerender_manager->mutable_config().https_allowed = true;
1277 ASSERT_TRUE(prerender_contents_factory_ == NULL); 1276 ASSERT_TRUE(prerender_contents_factory_ == NULL);
1278 prerender_contents_factory_ = 1277 prerender_contents_factory_ =
1279 new WaitForLoadPrerenderContentsFactory( 1278 new WaitForLoadPrerenderContentsFactory(
1280 expected_number_of_loads, 1279 expected_number_of_loads,
1281 expected_final_status_queue, 1280 expected_final_status_queue,
1282 prerender_should_wait_for_ready_title); 1281 prerender_should_wait_for_ready_title);
1283 prerender_manager->SetPrerenderContentsFactory( 1282 prerender_manager->SetPrerenderContentsFactory(
1284 prerender_contents_factory_); 1283 prerender_contents_factory_);
1285 FinalStatus expected_final_status = expected_final_status_queue.front(); 1284 FinalStatus expected_final_status = expected_final_status_queue.front();
1286 1285
(...skipping 2183 matching lines...) Expand 10 before | Expand all | Expand 10 after
3470 const NavigationController& controller = web_contents->GetController(); 3469 const NavigationController& controller = web_contents->GetController();
3471 // First entry is about:blank, second is prerender_page.html. 3470 // First entry is about:blank, second is prerender_page.html.
3472 EXPECT_TRUE(controller.GetPendingEntry() == NULL); 3471 EXPECT_TRUE(controller.GetPendingEntry() == NULL);
3473 EXPECT_EQ(2, controller.GetEntryCount()); 3472 EXPECT_EQ(2, controller.GetEntryCount());
3474 EXPECT_EQ(GURL(content::kAboutBlankURL), 3473 EXPECT_EQ(GURL(content::kAboutBlankURL),
3475 controller.GetEntryAtIndex(0)->GetURL()); 3474 controller.GetEntryAtIndex(0)->GetURL());
3476 EXPECT_EQ(dest_url(), controller.GetEntryAtIndex(1)->GetURL()); 3475 EXPECT_EQ(dest_url(), controller.GetEntryAtIndex(1)->GetURL());
3477 } 3476 }
3478 3477
3479 } // namespace prerender 3478 } // namespace prerender
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/prerender/prerender_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698