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

Unified Diff: chrome/browser/prerender/prerender_manager.h

Issue 9875026: **NOTFORLANDING** New link rel=prerender API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch sets 3-7 against trunk, for combined browsing Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prerender/prerender_manager.h
diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h
index 15f5011ddd594d0766e2542ddecdbc1cafe64e19..c66d7a12bcbe49d606218435cde409f2366e7a0d 100644
--- a/chrome/browser/prerender/prerender_manager.h
+++ b/chrome/browser/prerender/prerender_manager.h
@@ -8,6 +8,7 @@
#include <list>
#include <string>
+#include <utility>
#include "base/gtest_prod_util.h"
#include "base/hash_tables.h"
@@ -247,28 +248,33 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
// Needs access to AddPrerender.
friend class PrerenderContents;
+ // Needs access to GetEntry.
+ friend class PrerenderLinkManager;
+
// Test that needs needs access to internal functions.
friend class PrerenderBrowserTest;
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, AliasURLTest);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, CancelAllTest);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest,
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, AliasURLTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, CancelAllTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest,
CancelOmniboxRemovesOmniboxTest);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest,
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest,
CancelOmniboxDoesNotRemoveLinkTest);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, ClearTest);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, ControlGroup);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, DropOldestRequestTest);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, DropSecondRequestTest);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, ExpireTest);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, FoundTest);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, FragmentMatchesFragmentTest);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, FragmentMatchesPageTest);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, PageMatchesFragmentTest);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, PendingPrerenderTest);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, RateLimitInWindowTest);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, RateLimitOutsideWindowTest);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, SourceRenderViewClosed);
- FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, TwoElementPrerenderTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, ClearTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, ControlGroup);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, DropOldestRequestTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, DropSecondRequestTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, ExpireTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, FoundTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, FragmentMatchesFragmentTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, FragmentMatchesPageTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, LinkManagerCancel);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, LinkManagerCancelTwiceCrash);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, PageMatchesFragmentTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, PendingPrerenderTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, RateLimitInWindowTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, RateLimitOutsideWindowTest);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, SourceRenderViewClosed);
+ FRIEND_TEST_ALL_PREFIXES(PrerenderTest, TwoElementPrerenderTest);
struct PrerenderContentsData;
struct NavigationRecord;

Powered by Google App Engine
This is Rietveld 408576698