diff options
author | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 04:50:34 +0000 |
---|---|---|
committer | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 04:50:34 +0000 |
commit | 4e6419cf5374adda16f97be965b8b7e5b225224f (patch) | |
tree | 594ced66460efaedf1071dd7468ba7012d0a6280 /chrome/test/testing_profile.h | |
parent | fc105849740379470c96501032e377668a2f5e7e (diff) | |
download | chromium_src-4e6419cf5374adda16f97be965b8b7e5b225224f.zip chromium_src-4e6419cf5374adda16f97be965b8b7e5b225224f.tar.gz chromium_src-4e6419cf5374adda16f97be965b8b7e5b225224f.tar.bz2 |
Introduce all the plumbing for Session Storage. This mostly consists of creating and tracking namespace ids in conjunction with the tabs. This is essentially just a bunch of dead code at the moment, but the next patch will get rid of the old way of generating/cloning IDs (initiated by the renderer) and instead use these IDs.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/550017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.h')
-rw-r--r-- | chrome/test/testing_profile.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index 77fdd40..3e38d3e 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -13,6 +13,7 @@ #include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/favicon_service.h" #include "chrome/browser/history/history.h" +#include "chrome/browser/in_process_webkit/webkit_context.h" #include "chrome/browser/net/url_request_context_getter.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" @@ -200,7 +201,11 @@ class TestingProfile : public Profile { virtual void ResetTabRestoreService() {} virtual SpellCheckHost* GetSpellCheckHost() { return NULL; } virtual void ReinitializeSpellCheckHost(bool force) { } - virtual WebKitContext* GetWebKitContext() { return NULL; } + virtual WebKitContext* GetWebKitContext() { + if (webkit_context_ == NULL) + webkit_context_ = new WebKitContext(GetPath(), false); + return webkit_context_; + } virtual WebKitContext* GetOffTheRecordWebKitContext() { return NULL; } virtual void MarkAsCleanShutdown() {} virtual void InitExtensions() {} @@ -270,6 +275,9 @@ class TestingProfile : public Profile { // The main database tracker for this profile. // Should be used only on the file thread. scoped_refptr<webkit_database::DatabaseTracker> db_tracker_; + + // WebKitContext, lazily initialized by GetWebKitContext(). + scoped_refptr<WebKitContext> webkit_context_; }; // A profile that derives from another profile. This does not actually |