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

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

Issue 11364053: make StackingClient dispatch to either ash or desktop (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase + disable prerender tests on win-aura Created 8 years, 1 month 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/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 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 310
311 // Needed to pass PrerenderManager's DCHECKs. 311 // Needed to pass PrerenderManager's DCHECKs.
312 TestingProfile profile_; 312 TestingProfile profile_;
313 MessageLoop message_loop_; 313 MessageLoop message_loop_;
314 content::TestBrowserThread ui_thread_; 314 content::TestBrowserThread ui_thread_;
315 scoped_ptr<UnitTestPrerenderManager> prerender_manager_; 315 scoped_ptr<UnitTestPrerenderManager> prerender_manager_;
316 scoped_ptr<PrerenderLinkManager> prerender_link_manager_; 316 scoped_ptr<PrerenderLinkManager> prerender_link_manager_;
317 int last_prerender_id_; 317 int last_prerender_id_;
318 }; 318 };
319 319
320 // TODO(scottmg): http://crbug.com/128578
321 #if !defined(OS_WIN) && !defined(USE_AURA)
320 TEST_F(PrerenderTest, FoundTest) { 322 TEST_F(PrerenderTest, FoundTest) {
321 GURL url("http://www.google.com/"); 323 GURL url("http://www.google.com/");
322 DummyPrerenderContents* prerender_contents = 324 DummyPrerenderContents* prerender_contents =
323 prerender_manager()->CreateNextPrerenderContents( 325 prerender_manager()->CreateNextPrerenderContents(
324 url, 326 url,
325 FINAL_STATUS_USED); 327 FINAL_STATUS_USED);
326 EXPECT_TRUE(AddSimplePrerender(url)); 328 EXPECT_TRUE(AddSimplePrerender(url));
327 EXPECT_TRUE(prerender_contents->prerendering_has_started()); 329 EXPECT_TRUE(prerender_contents->prerendering_has_started());
328 ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url)); 330 ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url));
329 } 331 }
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 DummyPrerenderContents* second_prerender_contents = 1156 DummyPrerenderContents* second_prerender_contents =
1155 prerender_manager()->CreateNextPrerenderContents( 1157 prerender_manager()->CreateNextPrerenderContents(
1156 url, FINAL_STATUS_USED); 1158 url, FINAL_STATUS_USED);
1157 EXPECT_TRUE(AddSimplePrerender(url)); 1159 EXPECT_TRUE(AddSimplePrerender(url));
1158 EXPECT_TRUE(second_prerender_contents->prerendering_has_started()); 1160 EXPECT_TRUE(second_prerender_contents->prerendering_has_started());
1159 ASSERT_EQ(second_prerender_contents, 1161 ASSERT_EQ(second_prerender_contents,
1160 prerender_manager()->FindAndUseEntry(url)); 1162 prerender_manager()->FindAndUseEntry(url));
1161 EXPECT_FALSE(IsEmptyPrerenderLinkManager()); 1163 EXPECT_FALSE(IsEmptyPrerenderLinkManager());
1162 } 1164 }
1163 1165
1166 #endif // OS_WIN && USE_AURA
1167
1164 } // namespace prerender 1168 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_manager.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698