summaryrefslogtreecommitdiffstats
path: root/chrome/test/testing_profile.h
diff options
context:
space:
mode:
authorglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-16 07:04:42 +0000
committerglen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-16 07:04:42 +0000
commit76688089aca3fd527d2d4ca3c81170f7e532c811 (patch)
tree993f88a0f62e34754abca1b2d28a82c9ed8141c9 /chrome/test/testing_profile.h
parent449c5e76fcd8fc265b4be054d3783d63648ed6e0 (diff)
downloadchromium_src-76688089aca3fd527d2d4ca3c81170f7e532c811.zip
chromium_src-76688089aca3fd527d2d4ca3c81170f7e532c811.tar.gz
chromium_src-76688089aca3fd527d2d4ca3c81170f7e532c811.tar.bz2
Attempt to fix leaks in DOMUISources test
TBR=arv Review URL: http://codereview.chromium.org/115441 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.h')
-rw-r--r--chrome/test/testing_profile.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 533b12e..f83e5e4 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -11,6 +11,7 @@
#include "base/file_util.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/browser_prefs.h"
+#include "chrome/browser/browser_theme_provider.h"
#include "chrome/browser/history/history.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/search_engines/template_url_model.h"
@@ -52,6 +53,9 @@ class TestingProfile : public Profile {
// Creates a TemplateURLModel. If not invoked the TemplateURLModel is NULL.
void CreateTemplateURLModel();
+ // Creates a ThemeProvider. If not invoked the ThemeProvider is NULL.
+ void CreateThemeProvider();
+
virtual FilePath GetPath() {
return path_;
}
@@ -123,7 +127,7 @@ class TestingProfile : public Profile {
virtual void SetTheme(Extension* extension) { }
virtual void ClearTheme() { }
virtual ThemeProvider* GetThemeProvider() {
- return NULL;
+ return theme_provider_.get();
}
virtual URLRequestContext* GetRequestContext() {
return NULL;
@@ -228,6 +232,9 @@ class TestingProfile : public Profile {
// The SessionService. Defaults to NULL, but can be set using the setter.
scoped_refptr<SessionService> session_service_;
+ // The theme provider. Only created if CreateThemeProvider is invoked.
+ scoped_refptr<BrowserThemeProvider> theme_provider_;
+
// Do we have a history service? This defaults to the value of
// history_service, but can be explicitly set.
bool has_history_service_;