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

Unified Diff: chrome/test/testing_profile.h

Issue 545054: Introduce all the plumbing for Session Storage. This mostly consists of crea... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 11 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
« no previous file with comments | « chrome/test/render_view_test.cc ('k') | chrome/worker/worker_webkitclient_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/testing_profile.h
===================================================================
--- chrome/test/testing_profile.h (revision 36257)
+++ chrome/test/testing_profile.h (working copy)
@@ -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,12 @@
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 +276,9 @@
// 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
« no previous file with comments | « chrome/test/render_view_test.cc ('k') | chrome/worker/worker_webkitclient_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698