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

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

Issue 7745003: Revert 98132 - Mark PrerenderTrackerNull test as flaky. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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
« 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <set> 5 #include <set>
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/prerender/prerender_manager.h" 8 #include "chrome/browser/prerender/prerender_manager.h"
9 #include "chrome/browser/prerender/prerender_tracker.h" 9 #include "chrome/browser/prerender/prerender_tracker.h"
10 #include "chrome/test/base/testing_browser_process.h" 10 #include "chrome/test/base/testing_browser_process.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 private: 71 private:
72 ScopedTestingBrowserProcess browser_process_; 72 ScopedTestingBrowserProcess browser_process_;
73 MessageLoop message_loop_; 73 MessageLoop message_loop_;
74 BrowserThread ui_thread_; 74 BrowserThread ui_thread_;
75 BrowserThread io_thread_; 75 BrowserThread io_thread_;
76 76
77 scoped_ptr<TestPrerenderManager> prerender_manager_; 77 scoped_ptr<TestPrerenderManager> prerender_manager_;
78 }; 78 };
79 79
80 // Check that a non-existant RenderView is handled correctly. 80 // Check that a non-existant RenderView is handled correctly.
81 TEST_F(PrerenderTrackerTest, FLAKY_PrerenderTrackerNull) { 81 TEST_F(PrerenderTrackerTest, PrerenderTrackerNull) {
82 FinalStatus final_status; 82 FinalStatus final_status;
83 EXPECT_FALSE(prerender_tracker()->TryUse(0, 0)); 83 EXPECT_FALSE(prerender_tracker()->TryUse(0, 0));
84 EXPECT_FALSE(prerender_tracker()->TryCancel(0, 0, FINAL_STATUS_HTTPS)); 84 EXPECT_FALSE(prerender_tracker()->TryCancel(0, 0, FINAL_STATUS_HTTPS));
85 EXPECT_FALSE(prerender_tracker()->TryCancelOnIOThread( 85 EXPECT_FALSE(prerender_tracker()->TryCancelOnIOThread(
86 0, 0, FINAL_STATUS_HTTPS)); 86 0, 0, FINAL_STATUS_HTTPS));
87 EXPECT_FALSE(prerender_tracker()->IsPrerenderingOnIOThread(0, 0)); 87 EXPECT_FALSE(prerender_tracker()->IsPrerenderingOnIOThread(0, 0));
88 EXPECT_FALSE(prerender_tracker()->GetFinalStatus(0, 0, &final_status)); 88 EXPECT_FALSE(prerender_tracker()->GetFinalStatus(0, 0, &final_status));
89 EXPECT_FALSE(prerender_manager()->WasPrerenderCancelled(0, 0)); 89 EXPECT_FALSE(prerender_manager()->WasPrerenderCancelled(0, 0));
90 } 90 }
91 91
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 328
329 remove_urls.clear(); 329 remove_urls.clear();
330 remove_urls.push_back(example_url); 330 remove_urls.push_back(example_url);
331 remove_urls.push_back(example_url); 331 remove_urls.push_back(example_url);
332 url_counter.RemoveURLs(remove_urls); 332 url_counter.RemoveURLs(remove_urls);
333 EXPECT_FALSE(url_counter.MatchesURL(example_url)); 333 EXPECT_FALSE(url_counter.MatchesURL(example_url));
334 EXPECT_FALSE(url_counter.MatchesURL(gmail_url)); 334 EXPECT_FALSE(url_counter.MatchesURL(gmail_url));
335 } 335 }
336 336
337 } // namespace prerender 337 } // 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