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

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

Issue 16703018: Rewrite scoped_ptr<T>(NULL) to use the default ctor in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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.h" 8 #include "base/message_loop.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 class UnitTestPrerenderManager : public PrerenderManager { 87 class UnitTestPrerenderManager : public PrerenderManager {
88 public: 88 public:
89 using PrerenderManager::kMinTimeBetweenPrerendersMs; 89 using PrerenderManager::kMinTimeBetweenPrerendersMs;
90 using PrerenderManager::kNavigationRecordWindowMs; 90 using PrerenderManager::kNavigationRecordWindowMs;
91 91
92 explicit UnitTestPrerenderManager(Profile* profile, 92 explicit UnitTestPrerenderManager(Profile* profile,
93 PrerenderTracker* prerender_tracker) 93 PrerenderTracker* prerender_tracker)
94 : PrerenderManager(profile, prerender_tracker), 94 : PrerenderManager(profile, prerender_tracker),
95 time_(Time::Now()), 95 time_(Time::Now()),
96 time_ticks_(TimeTicks::Now()), 96 time_ticks_(TimeTicks::Now()),
97 next_prerender_contents_(NULL),
98 prerender_tracker_(prerender_tracker) { 97 prerender_tracker_(prerender_tracker) {
99 set_rate_limit_enabled(false); 98 set_rate_limit_enabled(false);
100 } 99 }
101 100
102 virtual ~UnitTestPrerenderManager() { 101 virtual ~UnitTestPrerenderManager() {
103 } 102 }
104 103
105 // From BrowserContextKeyedService, via PrererenderManager: 104 // From BrowserContextKeyedService, via PrererenderManager:
106 virtual void Shutdown() OVERRIDE { 105 virtual void Shutdown() OVERRIDE {
107 if (next_prerender_contents()) 106 if (next_prerender_contents())
(...skipping 1307 matching lines...) Expand 10 before | Expand all | Expand 10 after
1415 EXPECT_EQ(null, prerender_manager()->FindEntry(second_url)); 1414 EXPECT_EQ(null, prerender_manager()->FindEntry(second_url));
1416 1415
1417 // The first prerender should have died, giving life to the second one. 1416 // The first prerender should have died, giving life to the second one.
1418 prerender_manager()->AdvanceTimeTicks(wait_for_first_prerender_to_expire); 1417 prerender_manager()->AdvanceTimeTicks(wait_for_first_prerender_to_expire);
1419 EXPECT_EQ(null, prerender_manager()->FindEntry(first_url)); 1418 EXPECT_EQ(null, prerender_manager()->FindEntry(first_url));
1420 EXPECT_EQ(second_prerender_contents, 1419 EXPECT_EQ(second_prerender_contents,
1421 prerender_manager()->FindAndUseEntry(second_url)); 1420 prerender_manager()->FindAndUseEntry(second_url));
1422 } 1421 }
1423 1422
1424 } // namespace prerender 1423 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698