Remove getters for HTML5 related objects from the ResourceContext interface. Half of them weren't u…

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/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/browser/resource_context_impl.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 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* 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
@@ skipping 30 matching lines @@
           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));
 
-  // Check first to avoid memory leak in unittests.

[Jói, 2012/02/20 23:13:49]

I'm sure you're sure, but would still suggest running valgrind and memcheck
trybots since you're changing this.

[jam, 2012/02/21 01:20:13]

oops, thanks for catching this! This change got lost when these lines got
reverted and added, and the change didn't carry over because of a conflict.
added back. ditto on the bottom of the file. i should have reviewed this more
carefully after the conflict (oh the joy of reverts ;) ).

good idea re running this through memory bots either way, will do

-  if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
-    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())));
-  }
+  InitializeResourceContext(context);
+
+  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(
+AppCacheService* 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);
+void BrowserContext::EnsureResourceContextInitialized(BrowserContext* context) {
+  if (context->GetResourceContext()->GetUserData(kWebKitContextKeyName))
+    return;
+  InitializeResourceContext(context);
 }
 
 BrowserContext::~BrowserContext() {
-  if (GetUserData(kDatabaseTrackerKeyName) &&
-      BrowserThread::IsMessageLoopValid(BrowserThread::FILE)) {
+  if (GetUserData(kDatabaseTrackerKeyName)) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&webkit_database::DatabaseTracker::Shutdown,
                    GetDatabaseTracker(this)));
   }
 }
 
 }  // namespace content