diff options
| author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-25 16:37:52 +0000 |
|---|---|---|
| committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-25 16:37:52 +0000 |
| commit | 1c6228b0524593d75518a2a5a961898f88fe7be8 (patch) | |
| tree | e2d97a3fc7dcb0d80a4a2564f061819d33a57eac /chrome/test/testing_profile.cc | |
| parent | 954b8764c666a1f75a4efd97db9ac6f4db032d0a (diff) | |
| download | chromium_src-1c6228b0524593d75518a2a5a961898f88fe7be8.zip chromium_src-1c6228b0524593d75518a2a5a961898f88fe7be8.tar.gz chromium_src-1c6228b0524593d75518a2a5a961898f88fe7be8.tar.bz2 | |
Return NULL instead of a WeakPtr.
I'm not sure why this worked without a compiler warning.
BUG=77930
TEST=Existing unit tests and browser tests.
Review URL: http://codereview.chromium.org/6897025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.cc')
| -rw-r--r-- | chrome/test/testing_profile.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc index 84787b0..0426e19 100644 --- a/chrome/test/testing_profile.cc +++ b/chrome/test/testing_profile.cc @@ -792,7 +792,7 @@ ChromeURLDataManager* TestingProfile::GetChromeURLDataManager() { prerender::PrerenderManager* TestingProfile::GetPrerenderManager() { if (!prerender::PrerenderManager::IsPrerenderingPossible()) - return base::WeakPtr<prerender::PrerenderManager>(); + return NULL; if (!prerender_manager_.get()) prerender_manager_.reset(new prerender::PrerenderManager(this)); return prerender_manager_.get(); |