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

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

Issue 10386171: Remove redundant boolean from unit test code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and merge Created 8 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
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 "chrome/browser/prerender/prerender_contents.h" 5 #include "chrome/browser/prerender/prerender_contents.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 } 235 }
236 236
237 PrerenderContents::PrerenderContents( 237 PrerenderContents::PrerenderContents(
238 PrerenderManager* prerender_manager, 238 PrerenderManager* prerender_manager,
239 PrerenderTracker* prerender_tracker, 239 PrerenderTracker* prerender_tracker,
240 Profile* profile, 240 Profile* profile,
241 const GURL& url, 241 const GURL& url,
242 const content::Referrer& referrer, 242 const content::Referrer& referrer,
243 Origin origin, 243 Origin origin,
244 uint8 experiment_id) 244 uint8 experiment_id)
245 : prerender_manager_(prerender_manager), 245 : prerendering_has_started_(false),
246 prerender_manager_(prerender_manager),
246 prerender_tracker_(prerender_tracker), 247 prerender_tracker_(prerender_tracker),
247 prerender_url_(url), 248 prerender_url_(url),
248 referrer_(referrer), 249 referrer_(referrer),
249 profile_(profile), 250 profile_(profile),
250 page_id_(0), 251 page_id_(0),
251 has_stopped_loading_(false), 252 has_stopped_loading_(false),
252 has_finished_loading_(false), 253 has_finished_loading_(false),
253 final_status_(FINAL_STATUS_MAX), 254 final_status_(FINAL_STATUS_MAX),
254 prerendering_has_started_(false),
255 match_complete_status_(MATCH_COMPLETE_DEFAULT), 255 match_complete_status_(MATCH_COMPLETE_DEFAULT),
256 prerendering_has_been_cancelled_(false), 256 prerendering_has_been_cancelled_(false),
257 child_id_(-1), 257 child_id_(-1),
258 route_id_(-1), 258 route_id_(-1),
259 origin_(origin), 259 origin_(origin),
260 experiment_id_(experiment_id), 260 experiment_id_(experiment_id),
261 creator_child_id_(-1) { 261 creator_child_id_(-1) {
262 DCHECK(prerender_manager != NULL); 262 DCHECK(prerender_manager != NULL);
263 } 263 }
264 264
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 bool PrerenderContents::IsCrossSiteNavigationPending() const { 708 bool PrerenderContents::IsCrossSiteNavigationPending() const {
709 if (!prerender_contents_.get() || !prerender_contents_->web_contents()) 709 if (!prerender_contents_.get() || !prerender_contents_->web_contents())
710 return false; 710 return false;
711 const WebContents* web_contents = prerender_contents_->web_contents(); 711 const WebContents* web_contents = prerender_contents_->web_contents();
712 return (web_contents->GetSiteInstance() != 712 return (web_contents->GetSiteInstance() !=
713 web_contents->GetPendingSiteInstance()); 713 web_contents->GetPendingSiteInstance());
714 } 714 }
715 715
716 716
717 } // namespace prerender 717 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/prerender/prerender_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698