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

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

Issue 11299211: (re-)enable prerender unit tests on win_aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years 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 | no next file » | 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/scoped_vector.h" 6 #include "base/memory/scoped_vector.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "chrome/browser/prerender/prerender_contents.h" 10 #include "chrome/browser/prerender/prerender_contents.h"
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 323
324 // Needed to pass PrerenderManager's DCHECKs. 324 // Needed to pass PrerenderManager's DCHECKs.
325 TestingProfile profile_; 325 TestingProfile profile_;
326 MessageLoop message_loop_; 326 MessageLoop message_loop_;
327 content::TestBrowserThread ui_thread_; 327 content::TestBrowserThread ui_thread_;
328 scoped_ptr<UnitTestPrerenderManager> prerender_manager_; 328 scoped_ptr<UnitTestPrerenderManager> prerender_manager_;
329 scoped_ptr<PrerenderLinkManager> prerender_link_manager_; 329 scoped_ptr<PrerenderLinkManager> prerender_link_manager_;
330 int last_prerender_id_; 330 int last_prerender_id_;
331 }; 331 };
332 332
333 // TODO(scottmg): http://crbug.com/128578
334 #if !(defined(OS_WIN) && defined(USE_AURA))
335 TEST_F(PrerenderTest, FoundTest) { 333 TEST_F(PrerenderTest, FoundTest) {
336 GURL url("http://www.google.com/"); 334 GURL url("http://www.google.com/");
337 DummyPrerenderContents* prerender_contents = 335 DummyPrerenderContents* prerender_contents =
338 prerender_manager()->CreateNextPrerenderContents( 336 prerender_manager()->CreateNextPrerenderContents(
339 url, 337 url,
340 FINAL_STATUS_USED); 338 FINAL_STATUS_USED);
341 EXPECT_TRUE(AddSimplePrerender(url)); 339 EXPECT_TRUE(AddSimplePrerender(url));
342 EXPECT_TRUE(prerender_contents->prerendering_has_started()); 340 EXPECT_TRUE(prerender_contents->prerendering_has_started());
343 ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url)); 341 ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url));
344 } 342 }
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
1191 DummyPrerenderContents* second_prerender_contents = 1189 DummyPrerenderContents* second_prerender_contents =
1192 prerender_manager()->CreateNextPrerenderContents( 1190 prerender_manager()->CreateNextPrerenderContents(
1193 url, FINAL_STATUS_USED); 1191 url, FINAL_STATUS_USED);
1194 EXPECT_TRUE(AddSimplePrerender(url)); 1192 EXPECT_TRUE(AddSimplePrerender(url));
1195 EXPECT_TRUE(second_prerender_contents->prerendering_has_started()); 1193 EXPECT_TRUE(second_prerender_contents->prerendering_has_started());
1196 ASSERT_EQ(second_prerender_contents, 1194 ASSERT_EQ(second_prerender_contents,
1197 prerender_manager()->FindAndUseEntry(url)); 1195 prerender_manager()->FindAndUseEntry(url));
1198 EXPECT_FALSE(IsEmptyPrerenderLinkManager()); 1196 EXPECT_FALSE(IsEmptyPrerenderLinkManager());
1199 } 1197 }
1200 1198
1201 #endif // !(defined(OS_WIN) && defined(USE_AURA))
1202
1203 } // namespace prerender 1199 } // namespace prerender
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698