Get rid of WebKitContext. Only two out of six HTML5 related objects were in it and it was just a gl…

content/browser/browser_context.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/browser/browser_context.h"
 
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/file_system/browser_file_system_helper.h"
 #include "content/browser/in_process_webkit/dom_storage_context_impl.h"
 #include "content/browser/in_process_webkit/indexed_db_context_impl.h"
-#include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/browser/resource_context_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_constants.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/quota/quota_manager.h"
 
 using appcache::AppCacheService;
 using base::UserDataAdapter;
 using content::BrowserThread;
 using fileapi::FileSystemContext;
 using quota::QuotaManager;
 using webkit_database::DatabaseTracker;
 
 // Key names on BrowserContext.
 static const char* kAppCacheServicKeyName = "content_appcache_service_tracker";
 static const char* kDatabaseTrackerKeyName = "content_database_tracker";
+static const char* kDOMStorageContextKeyName = "content_dom_storage_context";
 static const char* kFileSystemContextKeyName = "content_file_system_context";
+static const char* kIndexedDBContextKeyName = "content_indexed_db_context";
 static const char* kQuotaManagerKeyName = "content_quota_manager";
-static const char* kWebKitContextKeyName = "content_webkit_context";
 
 namespace content {
 
 void CreateQuotaManagerAndClients(BrowserContext* context) {
   if (context->GetUserData(kQuotaManagerKeyName)) {
     DCHECK(context->GetUserData(kDatabaseTrackerKeyName));
+    DCHECK(context->GetUserData(kDOMStorageContextKeyName));
     DCHECK(context->GetUserData(kFileSystemContextKeyName));
-    DCHECK(context->GetUserData(kWebKitContextKeyName));
+    DCHECK(context->GetUserData(kIndexedDBContextKeyName));
     return;
   }
 
   // All of the clients have to be created and registered with the
   // QuotaManager prior to the QuotaManger being used. So we do them
   // all together here prior to handing out a reference to anything
   // that utlizes the QuotaManager.
   scoped_refptr<QuotaManager> quota_manager = new quota::QuotaManager(
     context->IsOffTheRecord(), context->GetPath(),
     BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
@@ skipping 11 matching lines @@
       kFileSystemContextKeyName,
       new UserDataAdapter<FileSystemContext>(filesystem_context));
 
   scoped_refptr<DatabaseTracker> db_tracker = new DatabaseTracker(
       context->GetPath(), context->IsOffTheRecord(), false,
       context->GetSpecialStoragePolicy(), quota_manager->proxy(),
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
   context->SetUserData(kDatabaseTrackerKeyName, 
                        new UserDataAdapter<DatabaseTracker>(db_tracker));
 
-  scoped_refptr<WebKitContext> webkit_context = new WebKitContext(
-      context->IsOffTheRecord(), context->GetPath(),
-      context->GetSpecialStoragePolicy(), quota_manager->proxy(),
+  FilePath path = context->IsOffTheRecord() ? FilePath() : context->GetPath();
+  scoped_refptr<DOMStorageContext> dom_storage_context =
+      new DOMStorageContextImpl(path, context->GetSpecialStoragePolicy());
+  context->SetUserData(
+      kDOMStorageContextKeyName,
+      new UserDataAdapter<DOMStorageContext>(dom_storage_context));
+
+  scoped_refptr<IndexedDBContext> indexed_db_context = new IndexedDBContextImpl(
+      path, context->GetSpecialStoragePolicy(), quota_manager->proxy(),
       BrowserThread::GetMessageLoopProxyForThread(
           BrowserThread::WEBKIT_DEPRECATED));
-  context->SetUserData(kWebKitContextKeyName,
-                       new UserDataAdapter<WebKitContext>(webkit_context));
+  context->SetUserData(
+      kIndexedDBContextKeyName,
+      new UserDataAdapter<IndexedDBContext>(indexed_db_context));
 
   scoped_refptr<ChromeAppCacheService> appcache_service =
       new ChromeAppCacheService(quota_manager->proxy());
   context->SetUserData(
       kAppCacheServicKeyName,
       new UserDataAdapter<ChromeAppCacheService>(appcache_service));
 
   EnsureResourceContextInitialized(context);
 
   // Check first to avoid memory leak in unittests.
@@ skipping 30 matching lines @@
 void PurgeMemoryOnWebkitThread(
     scoped_refptr<DOMStorageContextImpl> dom_storage_context) {
   dom_storage_context->PurgeMemory();
 }
 
 QuotaManager* BrowserContext::GetQuotaManager(BrowserContext* context) {
   CreateQuotaManagerAndClients(context);
   return UserDataAdapter<QuotaManager>::Get(context, kQuotaManagerKeyName);
 }
 
-WebKitContext* BrowserContext::GetWebKitContext(BrowserContext* context) {
+DOMStorageContext* BrowserContext::GetDOMStorageContext(
+    BrowserContext* context) {
   CreateQuotaManagerAndClients(context);
-  return UserDataAdapter<WebKitContext>::Get(context, kWebKitContextKeyName);
+  return UserDataAdapter<DOMStorageContext>::Get(
+      context, kDOMStorageContextKeyName);
+}
+
+IndexedDBContext* BrowserContext::GetIndexedDBContext(BrowserContext* context) {
+  CreateQuotaManagerAndClients(context);
+  return UserDataAdapter<IndexedDBContext>::Get(
+      context, kIndexedDBContextKeyName);
 }
 
 DatabaseTracker* BrowserContext::GetDatabaseTracker(BrowserContext* context) {
   CreateQuotaManagerAndClients(context);
   return UserDataAdapter<DatabaseTracker>::Get(
       context, kDatabaseTrackerKeyName);
 }
 
 AppCacheService* BrowserContext::GetAppCacheService(
     BrowserContext* browser_context) {
@@ skipping 18 matching lines @@
 
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&SaveSessionStateOnIOThread,
                    browser_context->GetResourceContext()));
   }
 
   if (BrowserThread::IsMessageLoopValid(BrowserThread::WEBKIT_DEPRECATED)) {
     DOMStorageContextImpl* dom_context = static_cast<DOMStorageContextImpl*>(
-        DOMStorageContextImpl::GetForBrowserContext(browser_context));
+        GetDOMStorageContext(browser_context));
     IndexedDBContextImpl* indexed_db = static_cast<IndexedDBContextImpl*>(
-        IndexedDBContext::GetForBrowserContext(browser_context));
+        GetIndexedDBContext(browser_context));
     BrowserThread::PostTask(
         BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
         base::Bind(&SaveSessionStateOnWebkitThread,
                    make_scoped_refptr(dom_context),
                    make_scoped_refptr(indexed_db)));
   }
 }
 
 void BrowserContext::ClearLocalOnDestruction(BrowserContext* browser_context) {
   DOMStorageContextImpl* dom_context = static_cast<DOMStorageContextImpl*>(
-        DOMStorageContextImpl::GetForBrowserContext(browser_context));
+      GetDOMStorageContext(browser_context));
   dom_context->set_clear_local_state_on_exit(true);
 
   IndexedDBContextImpl* indexed_db = static_cast<IndexedDBContextImpl*>(
-        IndexedDBContext::GetForBrowserContext(browser_context));
+      GetIndexedDBContext(browser_context));
   indexed_db->set_clear_local_state_on_exit(true);
 
   GetDatabaseTracker(browser_context)->SetClearLocalStateOnExit(true);
 
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(&appcache::AppCacheService::set_clear_local_state_on_exit,
               base::Unretained(GetAppCacheService(browser_context)), true));
   }
 }
 
 void BrowserContext::PurgeMemory(BrowserContext* browser_context) {
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&PurgeMemoryOnIOThread,
                    browser_context->GetResourceContext()));
   }
 
   if (BrowserThread::IsMessageLoopValid(BrowserThread::WEBKIT_DEPRECATED)) {
     DOMStorageContextImpl* dom_context = static_cast<DOMStorageContextImpl*>(
-        DOMStorageContextImpl::GetForBrowserContext(browser_context));
+        GetDOMStorageContext(browser_context));
     BrowserThread::PostTask(
         BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
         base::Bind(&PurgeMemoryOnWebkitThread,
                    make_scoped_refptr(dom_context)));
   }
 }
 
 BrowserContext::~BrowserContext() {
+  // These message loop checks are just to avoid leaks in unittests.
   if (GetUserData(kDatabaseTrackerKeyName) &&
       BrowserThread::IsMessageLoopValid(BrowserThread::FILE)) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&webkit_database::DatabaseTracker::Shutdown,
                    GetDatabaseTracker(this)));
   }
+
+  if (GetUserData(kDOMStorageContextKeyName) &&
+      BrowserThread::IsMessageLoopValid(BrowserThread::WEBKIT_DEPRECATED)) {
+    DOMStorageContext* dom_storage_context =
+        (static_cast<UserDataAdapter<DOMStorageContext>*>(
+            GetUserData(kDOMStorageContextKeyName)))->release();
+    BrowserThread::ReleaseSoon(
+        BrowserThread::WEBKIT_DEPRECATED, FROM_HERE, dom_storage_context);
+  }
 }
 
 }  // namespace content