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

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

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixing 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
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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 ui_thread_(BrowserThread::UI, &message_loop_), 44 ui_thread_(BrowserThread::UI, &message_loop_),
45 io_thread_(BrowserThread::IO, &message_loop_), 45 io_thread_(BrowserThread::IO, &message_loop_),
46 prerender_manager_(new TestPrerenderManager(prerender_tracker())) { 46 prerender_manager_(new TestPrerenderManager(prerender_tracker())) {
47 } 47 }
48 48
49 TestPrerenderManager* prerender_manager() { 49 TestPrerenderManager* prerender_manager() {
50 return prerender_manager_.get(); 50 return prerender_manager_.get();
51 } 51 }
52 52
53 PrerenderTracker* prerender_tracker() { 53 PrerenderTracker* prerender_tracker() {
54 return browser_process_.get()->prerender_tracker(); 54 return g_browser_process->prerender_tracker();
55 } 55 }
56 56
57 int GetCurrentStatus(int child_id, int route_id) { 57 int GetCurrentStatus(int child_id, int route_id) {
58 FinalStatus final_status; 58 FinalStatus final_status;
59 if (!prerender_tracker()->GetFinalStatus(child_id, route_id, 59 if (!prerender_tracker()->GetFinalStatus(child_id, route_id,
60 &final_status)) { 60 &final_status)) {
61 return -1; 61 return -1;
62 } 62 }
63 return final_status; 63 return final_status;
64 } 64 }
65 65
66 // Runs any tasks queued on either thread. 66 // Runs any tasks queued on either thread.
67 void RunEvents() { 67 void RunEvents() {
68 message_loop_.RunAllPending(); 68 message_loop_.RunAllPending();
69 } 69 }
70 70
71 private: 71 private:
72 ScopedTestingBrowserProcess browser_process_;
73 MessageLoop message_loop_; 72 MessageLoop message_loop_;
74 BrowserThread ui_thread_; 73 BrowserThread ui_thread_;
75 BrowserThread io_thread_; 74 BrowserThread io_thread_;
76 75
77 scoped_ptr<TestPrerenderManager> prerender_manager_; 76 scoped_ptr<TestPrerenderManager> prerender_manager_;
78 }; 77 };
79 78
80 // Check that a non-existant RenderView is handled correctly. 79 // Check that a non-existant RenderView is handled correctly.
81 TEST_F(PrerenderTrackerTest, PrerenderTrackerNull) { 80 TEST_F(PrerenderTrackerTest, PrerenderTrackerNull) {
82 FinalStatus final_status; 81 FinalStatus final_status;
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 327
329 remove_urls.clear(); 328 remove_urls.clear();
330 remove_urls.push_back(example_url); 329 remove_urls.push_back(example_url);
331 remove_urls.push_back(example_url); 330 remove_urls.push_back(example_url);
332 url_counter.RemoveURLs(remove_urls); 331 url_counter.RemoveURLs(remove_urls);
333 EXPECT_FALSE(url_counter.MatchesURL(example_url)); 332 EXPECT_FALSE(url_counter.MatchesURL(example_url));
334 EXPECT_FALSE(url_counter.MatchesURL(gmail_url)); 333 EXPECT_FALSE(url_counter.MatchesURL(gmail_url));
335 } 334 }
336 335
337 } // namespace prerender 336 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698