Make the content::DOMStorageContext methods callable on the main thread and hide the threading deta…

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/fileapi/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"
@@ skipping 54 matching lines @@
       new UserDataAdapter<FileSystemContext>(filesystem_context));
 
   scoped_refptr<DatabaseTracker> db_tracker = new DatabaseTracker(
       context->GetPath(), context->IsOffTheRecord(),
       context->GetSpecialStoragePolicy(), quota_manager->proxy(),
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
   context->SetUserData(kDatabaseTrackerKeyName, 
                        new UserDataAdapter<DatabaseTracker>(db_tracker));
 
   FilePath path = context->IsOffTheRecord() ? FilePath() : context->GetPath();
-  scoped_refptr<DOMStorageContext> dom_storage_context =
+  scoped_refptr<DOMStorageContextImpl> dom_storage_context =
       new DOMStorageContextImpl(path, context->GetSpecialStoragePolicy());
   context->SetUserData(
       kDOMStorageContextKeyName,
-      new UserDataAdapter<DOMStorageContext>(dom_storage_context));
+      new UserDataAdapter<DOMStorageContextImpl>(dom_storage_context));
 
   scoped_refptr<IndexedDBContext> indexed_db_context = new IndexedDBContextImpl(
       path, context->GetSpecialStoragePolicy(), quota_manager->proxy(),
       BrowserThread::GetMessageLoopProxyForThread(
           BrowserThread::WEBKIT_DEPRECATED));
   context->SetUserData(
       kIndexedDBContextKeyName,
       new UserDataAdapter<IndexedDBContext>(indexed_db_context));
 
   scoped_refptr<ChromeAppCacheService> appcache_service =
@@ skipping 41 matching lines @@
 }
 
 QuotaManager* BrowserContext::GetQuotaManager(BrowserContext* context) {
   CreateQuotaManagerAndClients(context);
   return UserDataAdapter<QuotaManager>::Get(context, kQuotaManagerKeyName);
 }
 
 DOMStorageContext* BrowserContext::GetDOMStorageContext(
     BrowserContext* context) {
   CreateQuotaManagerAndClients(context);
-  return UserDataAdapter<DOMStorageContext>::Get(
+  return UserDataAdapter<DOMStorageContextImpl>::Get(
       context, kDOMStorageContextKeyName);
 }
 
 IndexedDBContext* BrowserContext::GetIndexedDBContext(BrowserContext* context) {
   CreateQuotaManagerAndClients(context);
   return UserDataAdapter<IndexedDBContext>::Get(
       context, kIndexedDBContextKeyName);
 }
 
 DatabaseTracker* BrowserContext::GetDatabaseTracker(BrowserContext* context) {
@@ skipping 91 matching lines @@
   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>*>(
+    DOMStorageContextImpl* dom_storage_context =
+        (static_cast<UserDataAdapter<DOMStorageContextImpl>*>(
             GetUserData(kDOMStorageContextKeyName)))->release();
     BrowserThread::ReleaseSoon(
         BrowserThread::WEBKIT_DEPRECATED, FROM_HERE, dom_storage_context);
   }
 }
 
 }  // namespace content