| Index: chrome/browser/prerender/prerender_render_view_tracker.h
|
| diff --git a/chrome/browser/prerender/prerender_tracker.h b/chrome/browser/prerender/prerender_render_view_tracker.h
|
| similarity index 79%
|
| rename from chrome/browser/prerender/prerender_tracker.h
|
| rename to chrome/browser/prerender/prerender_render_view_tracker.h
|
| index 6a269ef127c5ab360e6938b2a2465d39919bb5b5..ab34c624a61cda480de147b0aefd215c085403d1 100644
|
| --- a/chrome/browser/prerender/prerender_tracker.h
|
| +++ b/chrome/browser/prerender/prerender_render_view_tracker.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_PRERENDER_PRERENDER_TRACKER_H_
|
| -#define CHROME_BROWSER_PRERENDER_PRERENDER_TRACKER_H_
|
| +#ifndef CHROME_BROWSER_PRERENDER_PRERENDER_RENDER_VIEW_TRACKER_H_
|
| +#define CHROME_BROWSER_PRERENDER_PRERENDER_RENDER_VIEW_TRACKER_H_
|
| #pragma once
|
|
|
| #include <map>
|
| @@ -21,13 +21,13 @@ namespace prerender {
|
| class PrerenderManager;
|
| struct RenderViewInfo;
|
|
|
| -// PrerenderTracker is responsible for keeping track of all prerendering
|
| -// RenderViews and their statuses. Its list is guaranteed to be up to date
|
| -// and can be modified on any thread.
|
| -class PrerenderTracker {
|
| +// PrerenderRenderViewTracker is responsible for keeping track of all
|
| +// prerendering RenderViews and their statuses. Its list is guaranteed to be up
|
| +// to date and can be modified on any thread.
|
| +class PrerenderRenderViewTracker {
|
| public:
|
| - PrerenderTracker();
|
| - ~PrerenderTracker();
|
| + PrerenderRenderViewTracker();
|
| + ~PrerenderRenderViewTracker();
|
|
|
| // Attempts to set the status of the specified RenderViewHost to
|
| // FINAL_STATUS_USED. Returns true on success. Returns false if it has
|
| @@ -69,12 +69,18 @@ class PrerenderTracker {
|
|
|
| private:
|
| friend class PrerenderContents;
|
| - FRIEND_TEST_ALL_PREFIXES(PrerenderTrackerTest, PrerenderTrackerNull);
|
| - FRIEND_TEST_ALL_PREFIXES(PrerenderTrackerTest, PrerenderTrackerUsed);
|
| - FRIEND_TEST_ALL_PREFIXES(PrerenderTrackerTest, PrerenderTrackerCancelled);
|
| - FRIEND_TEST_ALL_PREFIXES(PrerenderTrackerTest, PrerenderTrackerCancelledOnIO);
|
| - FRIEND_TEST_ALL_PREFIXES(PrerenderTrackerTest, PrerenderTrackerCancelledFast);
|
| - FRIEND_TEST_ALL_PREFIXES(PrerenderTrackerTest, PrerenderTrackerMultiple);
|
| + FRIEND_TEST_ALL_PREFIXES(PrerenderRenderViewTrackerTest,
|
| + PrerenderRenderViewTrackerNull);
|
| + FRIEND_TEST_ALL_PREFIXES(PrerenderRenderViewTrackerTest,
|
| + PrerenderRenderViewTrackerUsed);
|
| + FRIEND_TEST_ALL_PREFIXES(PrerenderRenderViewTrackerTest,
|
| + PrerenderRenderViewTrackerCancelled);
|
| + FRIEND_TEST_ALL_PREFIXES(PrerenderRenderViewTrackerTest,
|
| + PrerenderRenderViewTrackerCancelledOnIO);
|
| + FRIEND_TEST_ALL_PREFIXES(PrerenderRenderViewTrackerTest,
|
| + PrerenderRenderViewTrackerCancelledFast);
|
| + FRIEND_TEST_ALL_PREFIXES(PrerenderRenderViewTrackerTest,
|
| + PrerenderRenderViewTrackerMultiple);
|
|
|
| typedef std::pair<int, int> ChildRouteIdPair;
|
| // Map of child/route id pairs to final statuses.
|
| @@ -119,7 +125,7 @@ class PrerenderTracker {
|
| static void RemovePrerenderOnIOThreadTask(
|
| const ChildRouteIdPair& child_route_id_pair);
|
|
|
| - static PrerenderTracker* GetDefault();
|
| + static PrerenderRenderViewTracker* GetDefault();
|
|
|
| // |final_status_map_lock_| protects access to |final_status_map_|.
|
| mutable base::Lock final_status_map_lock_;
|
| @@ -133,9 +139,9 @@ class PrerenderTracker {
|
| // used to prevent locking when not needed.
|
| PossiblyPrerenderingChildRouteIdPairs possibly_prerendering_io_thread_set_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(PrerenderTracker);
|
| + DISALLOW_COPY_AND_ASSIGN(PrerenderRenderViewTracker);
|
| };
|
|
|
| } // namespace prerender
|
|
|
| -#endif // CHROME_BROWSER_PRERENDER_PRERENDER_TRACKER_H_
|
| +#endif // CHROME_BROWSER_PRERENDER_PRERENDER_RENDER_VIEW_TRACKER_H_
|
|
|