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

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

Issue 1548133002: Switch to standard integer types in chrome/browser/, part 3 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
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 <stddef.h>
6 #include <stdint.h>
7
5 #include <map> 8 #include <map>
6 #include <utility> 9 #include <utility>
7 10
8 #include "base/command_line.h" 11 #include "base/command_line.h"
9 #include "base/format_macros.h" 12 #include "base/format_macros.h"
13 #include "base/macros.h"
10 #include "base/memory/scoped_vector.h" 14 #include "base/memory/scoped_vector.h"
11 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
12 #include "base/metrics/field_trial.h" 16 #include "base/metrics/field_trial.h"
13 #include "base/prefs/pref_service.h" 17 #include "base/prefs/pref_service.h"
14 #include "base/strings/stringprintf.h" 18 #include "base/strings/stringprintf.h"
15 #include "base/time/time.h" 19 #include "base/time/time.h"
16 #include "chrome/browser/net/prediction_options.h" 20 #include "chrome/browser/net/prediction_options.h"
17 #include "chrome/browser/prerender/prerender_contents.h" 21 #include "chrome/browser/prerender/prerender_contents.h"
18 #include "chrome/browser/prerender/prerender_field_trial.h" 22 #include "chrome/browser/prerender/prerender_field_trial.h"
19 #include "chrome/browser/prerender/prerender_handle.h" 23 #include "chrome/browser/prerender/prerender_handle.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 int route_id_; 83 int route_id_;
80 84
81 UnitTestPrerenderManager* test_prerender_manager_; 85 UnitTestPrerenderManager* test_prerender_manager_;
82 FinalStatus expected_final_status_; 86 FinalStatus expected_final_status_;
83 }; 87 };
84 88
85 int DummyPrerenderContents::g_next_route_id_ = 0; 89 int DummyPrerenderContents::g_next_route_id_ = 0;
86 90
87 const gfx::Size kSize(640, 480); 91 const gfx::Size kSize(640, 480);
88 92
89 const uint32 kDefaultRelTypes = PrerenderRelTypePrerender; 93 const uint32_t kDefaultRelTypes = PrerenderRelTypePrerender;
90 94
91 } // namespace 95 } // namespace
92 96
93 class UnitTestPrerenderManager : public PrerenderManager { 97 class UnitTestPrerenderManager : public PrerenderManager {
94 public: 98 public:
95 using PrerenderManager::kMinTimeBetweenPrerendersMs; 99 using PrerenderManager::kMinTimeBetweenPrerendersMs;
96 using PrerenderManager::kNavigationRecordWindowMs; 100 using PrerenderManager::kNavigationRecordWindowMs;
97 101
98 explicit UnitTestPrerenderManager(Profile* profile) 102 explicit UnitTestPrerenderManager(Profile* profile)
99 : PrerenderManager(profile), 103 : PrerenderManager(profile),
(...skipping 1463 matching lines...) Expand 10 before | Expand all | Expand 10 after
1563 CHECK(prerender_handle.get()); 1567 CHECK(prerender_handle.get());
1564 EXPECT_TRUE(prerender_handle->IsPrerendering()); 1568 EXPECT_TRUE(prerender_handle->IsPrerendering());
1565 EXPECT_TRUE(prerender_contents->prerendering_has_started()); 1569 EXPECT_TRUE(prerender_contents->prerendering_has_started());
1566 EXPECT_EQ(prerender_contents, prerender_handle->contents()); 1570 EXPECT_EQ(prerender_contents, prerender_handle->contents());
1567 EXPECT_EQ(ORIGIN_INSTANT, prerender_handle->contents()->origin()); 1571 EXPECT_EQ(ORIGIN_INSTANT, prerender_handle->contents()->origin());
1568 ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url)); 1572 ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url));
1569 EXPECT_FALSE(prerender_handle->IsPrerendering()); 1573 EXPECT_FALSE(prerender_handle->IsPrerendering());
1570 } 1574 }
1571 1575
1572 } // namespace prerender 1576 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_tab_helper.h ('k') | chrome/browser/prerender/prerender_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698