diff options
| author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-15 11:23:59 +0000 |
|---|---|---|
| committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-15 11:23:59 +0000 |
| commit | 4c154ff8753f6b9f87c289027bb00467a401be1e (patch) | |
| tree | 061043819035973dab0350b83196af9c5291a538 /chrome/test | |
| parent | 6812c1135479958778b00bd8eb096d59e4e86035 (diff) | |
| download | chromium_src-4c154ff8753f6b9f87c289027bb00467a401be1e.zip chromium_src-4c154ff8753f6b9f87c289027bb00467a401be1e.tar.gz chromium_src-4c154ff8753f6b9f87c289027bb00467a401be1e.tar.bz2 | |
Move FinalStatus out of PrerenderContents, and add prerender namespace.
I had a separate CL which wanted to record cancellations of prerenders which happened prior to a PrerenderContents object being created [in the PrerenderResourceHandler].
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/6503008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/testing_profile.cc | 2 | ||||
| -rw-r--r-- | chrome/test/testing_profile.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc index 43016f3..9ddc8d1 100644 --- a/chrome/test/testing_profile.cc +++ b/chrome/test/testing_profile.cc @@ -767,7 +767,7 @@ ChromeURLDataManager* TestingProfile::GetChromeURLDataManager() { return chrome_url_data_manager_.get(); } -PrerenderManager* TestingProfile::GetPrerenderManager() { +prerender::PrerenderManager* TestingProfile::GetPrerenderManager() { return NULL; } diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index 89b67ce..572c96d 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -274,7 +274,7 @@ class TestingProfile : public Profile { virtual PromoCounter* GetInstantPromoCounter(); virtual policy::ProfilePolicyContext* GetPolicyContext(); virtual ChromeURLDataManager* GetChromeURLDataManager(); - virtual PrerenderManager* GetPrerenderManager(); + virtual prerender::PrerenderManager* GetPrerenderManager(); virtual PrefService* GetOffTheRecordPrefs(); protected: |