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

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

Issue 10933065: Separate same domain and cross domain <link rel=...> prerenders for reporting. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: rebase... Created 8 years, 2 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
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 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 public: 207 public:
208 TestPrerenderContents( 208 TestPrerenderContents(
209 PrerenderManager* prerender_manager, 209 PrerenderManager* prerender_manager,
210 PrerenderTracker* prerender_tracker, 210 PrerenderTracker* prerender_tracker,
211 Profile* profile, 211 Profile* profile,
212 const GURL& url, 212 const GURL& url,
213 const content::Referrer& referrer, 213 const content::Referrer& referrer,
214 int expected_number_of_loads, 214 int expected_number_of_loads,
215 FinalStatus expected_final_status, 215 FinalStatus expected_final_status,
216 bool prerender_should_wait_for_ready_title) 216 bool prerender_should_wait_for_ready_title)
217 : PrerenderContents(prerender_manager, prerender_tracker, 217 : PrerenderContents(prerender_manager, prerender_tracker, profile, url,
218 profile, url, referrer, ORIGIN_LINK_REL_PRERENDER, 218 referrer, ORIGIN_LINK_REL_PRERENDER_SAMEDOMAIN,
219 PrerenderManager::kNoExperiment), 219 PrerenderManager::kNoExperiment),
mmenke 2012/10/17 15:12:16 The factory actually gets an origin when it create
gavinp 2012/10/17 20:57:49 Done.
220 number_of_loads_(0), 220 number_of_loads_(0),
221 expected_number_of_loads_(expected_number_of_loads), 221 expected_number_of_loads_(expected_number_of_loads),
222 expected_final_status_(expected_final_status), 222 expected_final_status_(expected_final_status),
223 new_render_view_host_(NULL), 223 new_render_view_host_(NULL),
224 was_hidden_(false), 224 was_hidden_(false),
225 was_shown_(false), 225 was_shown_(false),
226 should_be_shown_(expected_final_status == FINAL_STATUS_USED), 226 should_be_shown_(expected_final_status == FINAL_STATUS_USED),
227 quit_message_loop_on_destruction_( 227 quit_message_loop_on_destruction_(
228 expected_final_status != FINAL_STATUS_EVICTED && 228 expected_final_status != FINAL_STATUS_EVICTED &&
229 expected_final_status != FINAL_STATUS_APP_TERMINATING && 229 expected_final_status != FINAL_STATUS_APP_TERMINATING &&
(...skipping 2289 matching lines...) Expand 10 before | Expand all | Expand 10 after
2519 channel_close_watcher.WatchChannel( 2519 channel_close_watcher.WatchChannel(
2520 chrome::GetActiveWebContents(browser())->GetRenderProcessHost()); 2520 chrome::GetActiveWebContents(browser())->GetRenderProcessHost());
2521 NavigateToDestURL(); 2521 NavigateToDestURL();
2522 channel_close_watcher.WaitForChannelClose(); 2522 channel_close_watcher.WaitForChannelClose();
2523 2523
2524 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); 2524 ASSERT_TRUE(IsEmptyPrerenderLinkManager());
2525 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 2525 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
2526 } 2526 }
2527 2527
2528 } // namespace prerender 2528 } // namespace prerender
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/prerender/prerender_histograms.cc » ('j') | chrome/browser/prerender/prerender_histograms.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698