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

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

Issue 146983002: Move pending prerender logic into PrerenderLinkManager. (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
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/format_macros.h" 6 #include "base/format_macros.h"
7 #include "base/memory/scoped_vector.h" 7 #include "base/memory/scoped_vector.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 PrerenderContents* FindAndUseEntry(const GURL& url) { 128 PrerenderContents* FindAndUseEntry(const GURL& url) {
129 PrerenderData* prerender_data = FindPrerenderData(url, NULL); 129 PrerenderData* prerender_data = FindPrerenderData(url, NULL);
130 if (!prerender_data) 130 if (!prerender_data)
131 return NULL; 131 return NULL;
132 ScopedVector<PrerenderData>::iterator to_erase = 132 ScopedVector<PrerenderData>::iterator to_erase =
133 FindIteratorForPrerenderContents(prerender_data->contents()); 133 FindIteratorForPrerenderContents(prerender_data->contents());
134 CHECK(to_erase != active_prerenders_.end()); 134 CHECK(to_erase != active_prerenders_.end());
135 PrerenderContents* prerender_contents = prerender_data->ReleaseContents(); 135 PrerenderContents* prerender_contents = prerender_data->ReleaseContents();
136 active_prerenders_.erase(to_erase); 136 active_prerenders_.erase(to_erase);
137 137
138 prerender_contents->SetFinalStatus(FINAL_STATUS_USED);
139 prerender_contents->PrepareForUse(); 138 prerender_contents->PrepareForUse();
140 return prerender_contents; 139 return prerender_contents;
141 } 140 }
142 141
143 void AdvanceTime(TimeDelta delta) { 142 void AdvanceTime(TimeDelta delta) {
144 time_ += delta; 143 time_ += delta;
145 } 144 }
146 145
147 void AdvanceTimeTicks(TimeDelta delta) { 146 void AdvanceTimeTicks(TimeDelta delta) {
148 time_ticks_ += delta; 147 time_ticks_ += delta;
(...skipping 1328 matching lines...) Expand 10 before | Expand all | Expand 10 after
1477 CHECK(prerender_handle.get()); 1476 CHECK(prerender_handle.get());
1478 EXPECT_TRUE(prerender_handle->IsPrerendering()); 1477 EXPECT_TRUE(prerender_handle->IsPrerendering());
1479 EXPECT_TRUE(prerender_contents->prerendering_has_started()); 1478 EXPECT_TRUE(prerender_contents->prerendering_has_started());
1480 EXPECT_EQ(prerender_contents, prerender_handle->contents()); 1479 EXPECT_EQ(prerender_contents, prerender_handle->contents());
1481 EXPECT_EQ(ORIGIN_INSTANT, prerender_handle->contents()->origin()); 1480 EXPECT_EQ(ORIGIN_INSTANT, prerender_handle->contents()->origin());
1482 ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url)); 1481 ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url));
1483 EXPECT_FALSE(prerender_handle->IsPrerendering()); 1482 EXPECT_FALSE(prerender_handle->IsPrerendering());
1484 } 1483 }
1485 1484
1486 } // namespace prerender 1485 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698