summaryrefslogtreecommitdiffstats
path: root/content/browser/resource_context_impl.cc
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-29 00:48:52 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-29 00:48:52 +0000
commit5c8e67c5cb54c781f2732964541f8f2eb58638ad (patch)
tree4ad8d190d7667515991373b23df8b0858ab2836f /content/browser/resource_context_impl.cc
parent6a86a8e320782a0cb35b18dac3d803e09015aaee (diff)
downloadchromium_src-5c8e67c5cb54c781f2732964541f8f2eb58638ad.zip
chromium_src-5c8e67c5cb54c781f2732964541f8f2eb58638ad.tar.gz
chromium_src-5c8e67c5cb54c781f2732964541f8f2eb58638ad.tar.bz2
Access the DatabaseTracker via a StoragePartition to support the isolated app feature.
TBR=brettw,mkwst,kalman BUG=85121 Review URL: https://chromiumcodereview.appspot.com/10879075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153814 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/resource_context_impl.cc')
-rw-r--r--content/browser/resource_context_impl.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/content/browser/resource_context_impl.cc b/content/browser/resource_context_impl.cc
index e59692f..4fd0393 100644
--- a/content/browser/resource_context_impl.cc
+++ b/content/browser/resource_context_impl.cc
@@ -18,6 +18,7 @@
#include "content/browser/tcmalloc_internals_request_job.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/storage_partition.h"
#include "content/public/common/url_constants.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
@@ -259,7 +260,8 @@ void InitializeResourceContext(BrowserContext* browser_context) {
resource_context->SetUserData(
kDatabaseTrackerKeyName,
new UserDataAdapter<webkit_database::DatabaseTracker>(
- BrowserContext::GetDatabaseTracker(browser_context)));
+ BrowserContext::GetDefaultStoragePartition(browser_context)->
+ GetDatabaseTracker()));
resource_context->SetUserData(
kAppCacheServiceKeyName,
new UserDataAdapter<ChromeAppCacheService>(