Move creation of BrowserContext objects that live in content to content, instead of depending on th…

content/browser/browser_context.cc

Index: content/browser/browser_context.cc
===================================================================
--- content/browser/browser_context.cc	(revision 0)
+++ content/browser/browser_context.cc	(revision 0)
@@ -0,0 +1,164 @@
+// 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/chrome_blob_storage_context.h"
+#include "content/browser/file_system/browser_file_system_helper.h"
+#include "content/browser/in_process_webkit/webkit_context.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/common/content_constants.h"
+#include "webkit/database/database_tracker.h"
+#include "webkit/quota/quota_manager.h"
+
+using content::BrowserThread;
+using fileapi::FileSystemContext;
+using quota::QuotaManager;
+using webkit_database::DatabaseTracker;
+
+static const char* kAppCacheServicKeyName = "content_appcache_service_tracker";
+static const char* kBlobStorageContextKeyName = "content_blob_storage_context";
+static const char* kDatabaseTrackerKeyName = "content_database_tracker";
+static const char* kFileSystemContextKeyName = "content_file_system_context";
+static const char* kQuotaManagerKeyName = "content_quota_manager";
+static const char* kWebKitContextKeyName = "content_webkit_context";
+
+namespace content {
+
+// Adapter class that releases a refcounted object when the
+// SupportsUserData::Data object is deleted.
+template <typename T>
+class UserDataAdapter : public base::SupportsUserData::Data {
+ public:
+  static T* Get(BrowserContext* context, const char* key) {
+   UserDataAdapter* data =
+      static_cast<UserDataAdapter*>(context->GetUserData(key));
+    return static_cast<T*>(data->object_.get());
+  }
+
+  UserDataAdapter(T* object) : object_(object) {}
+
+ private:
+  scoped_refptr<T> object_;
+
+  DISALLOW_COPY_AND_ASSIGN(UserDataAdapter);
+};
+
+void CreateQuotaManagerAndClients(BrowserContext* context) {
+  if (context->GetUserData(kQuotaManagerKeyName)) {
+    DCHECK(context->GetUserData(kDatabaseTrackerKeyName));
+    DCHECK(context->GetUserData(kFileSystemContextKeyName));
+    DCHECK(context->GetUserData(kWebKitContextKeyName));
+    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(),

[Avi (use Gerrit), 2012/02/17 16:25:09]

http://crbug.com/89628 {sob}

and four other times below. I know it's just moving code around but it still
makes me sad.

[jam, 2012/02/17 16:29:25]

agree, it bothered me every time i moved this code.

I hope that we can at least make it more general, i.e. maybe just call it
in_memory only or something

+    BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
+    BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
+    context->GetSpecialStoragePolicy());
+  context->SetUserData(kQuotaManagerKeyName,
+                       new UserDataAdapter<QuotaManager>(quota_manager));
+
+  // Each consumer is responsible for registering its QuotaClient during
+  // its construction.
+  scoped_refptr<FileSystemContext> filesystem_context = CreateFileSystemContext(
+      context->GetPath(), context->IsOffTheRecord(),
+      context->GetSpecialStoragePolicy(), quota_manager->proxy());
+  context->SetUserData(
+      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(), false, quota_manager->proxy(),
+      BrowserThread::GetMessageLoopProxyForThread(
+          BrowserThread::WEBKIT_DEPRECATED));
+  context->SetUserData(kWebKitContextKeyName,
+                       new UserDataAdapter<WebKitContext>(webkit_context));
+
+  scoped_refptr<ChromeAppCacheService> appcache_service =
+      new ChromeAppCacheService(quota_manager->proxy());
+  context->SetUserData(
+      kAppCacheServicKeyName,
+      new UserDataAdapter<ChromeAppCacheService>(appcache_service));
+
+  BrowserThread::PostTask(
+    BrowserThread::IO, FROM_HERE,
+    base::Bind(&ChromeAppCacheService::InitializeOnIOThread,
+               appcache_service,
+               context->IsOffTheRecord() ? FilePath() :
+                   context->GetPath().Append(content::kAppCacheDirname),
+               context->GetResourceContext(),
+               make_scoped_refptr(context->GetSpecialStoragePolicy())));
+}
+
+QuotaManager* BrowserContext::GetQuotaManager(BrowserContext* context) {
+  CreateQuotaManagerAndClients(context);
+  return UserDataAdapter<QuotaManager>::Get(context, kQuotaManagerKeyName);
+}
+
+WebKitContext* BrowserContext::GetWebKitContext(BrowserContext* context) {
+  CreateQuotaManagerAndClients(context);
+  return UserDataAdapter<WebKitContext>::Get(context, kWebKitContextKeyName);
+}
+
+DatabaseTracker* BrowserContext::GetDatabaseTracker(BrowserContext* context) {
+  CreateQuotaManagerAndClients(context);
+  return UserDataAdapter<DatabaseTracker>::Get(
+      context, kDatabaseTrackerKeyName);
+}
+
+ChromeAppCacheService* BrowserContext::GetAppCacheService(
+    BrowserContext* browser_context) {
+  CreateQuotaManagerAndClients(browser_context);
+  return UserDataAdapter<ChromeAppCacheService>::Get(
+      browser_context, kAppCacheServicKeyName);
+}
+
+FileSystemContext* BrowserContext::GetFileSystemContext(
+    BrowserContext* browser_context) {
+  CreateQuotaManagerAndClients(browser_context);
+  return UserDataAdapter<FileSystemContext>::Get(
+      browser_context, kFileSystemContextKeyName);
+}
+
+ChromeBlobStorageContext* BrowserContext::GetBlobStorageContext(
+    BrowserContext* context) {
+  if (!context->GetUserData(kBlobStorageContextKeyName)) {
+    scoped_refptr<ChromeBlobStorageContext> blob =
+        new ChromeBlobStorageContext();
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(&ChromeBlobStorageContext::InitializeOnIOThread, blob));
+    context->SetUserData(kBlobStorageContextKeyName,
+                         new UserDataAdapter<ChromeBlobStorageContext>(blob));
+  }
+
+  return UserDataAdapter<ChromeBlobStorageContext>::Get(
+      context, kBlobStorageContextKeyName);
+}
+
+BrowserContext::~BrowserContext() {
+  if (GetUserData(kDatabaseTrackerKeyName)) {
+    BrowserThread::PostTask(
+        BrowserThread::FILE, FROM_HERE,
+        base::Bind(&webkit_database::DatabaseTracker::Shutdown,
+                   GetDatabaseTracker(this)));
+  }
+}
+
+}  // namespace content
Property changes on: content\browser\browser_context.cc
___________________________________________________________________
Added: svn:eol-style
   + LF