Move StoragePartition into content/public and remove BrowserContext::GetDOMStorageContext().

content/public/browser/browser_context.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_BROWSER_CONTEXT_H_
 #define CONTENT_PUBLIC_BROWSER_BROWSER_CONTEXT_H_
 
+#include "base/callback_forward.h"
 #include "base/hash_tables.h"
 #include "base/supports_user_data.h"
 #include "content/common/content_export.h"
 
 namespace appcache {
 class AppCacheService;
 }
 
 namespace fileapi {
 class FileSystemContext;
@@ skipping 15 matching lines @@
 class FilePath;
 
 namespace content {
 
 class DOMStorageContext;
 class DownloadManager;
 class DownloadManagerDelegate;
 class GeolocationPermissionContext;
 class IndexedDBContext;
 class ResourceContext;
+class SiteInstance;
 class SpeechRecognitionPreferences;
+class StoragePartition;
 
 // This class holds the context needed for a browsing session.
 // It lives on the UI thread. All these methods must only be called on the UI
 // thread.
 class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
  public:
+  typedef base::Callback<void(const std::string&, StoragePartition*)>
+      StoragePartitionCallback;
   static DownloadManager* GetDownloadManager(BrowserContext* browser_context);
   static quota::QuotaManager* GetQuotaManager(BrowserContext* browser_context);
-  static DOMStorageContext* GetDefaultDOMStorageContext(
-      BrowserContext* browser_context);
-  static DOMStorageContext* GetDOMStorageContext(
-      BrowserContext* browser_context, int renderer_child_id);
-  static content::DOMStorageContext* GetDOMStorageContextByPartitionId(
-      BrowserContext* browser_context, const std::string& partition_id);
   static IndexedDBContext* GetIndexedDBContext(BrowserContext* browser_context);
   static webkit_database::DatabaseTracker* GetDatabaseTracker(
       BrowserContext* browser_context);
   static appcache::AppCacheService* GetAppCacheService(
       BrowserContext* browser_context);
   static fileapi::FileSystemContext* GetFileSystemContext(
       BrowserContext* browser_context);
 
+  static content::StoragePartition* GetStoragePartition(
+      BrowserContext* browser_context, SiteInstance* site_instance);
+  static void ForEachStoragePartition(

[Charlie Reis, 2012/08/14 18:50:12]

Maybe add a comment here or on the callback typedef saying what the string in
the callback is for?

[awong, 2012/08/14 19:12:47]

Right. Good idea.

+      BrowserContext* browser_context,
+      const StoragePartitionCallback& callback);
+
+  // DON'T USE THIS. GetDefaultStoragePartition() is going away.
+  // Use GetStoragePartition() instead. Ask ajwong@ if you have problems.
+  static content::StoragePartition* GetDefaultStoragePartition(
+      BrowserContext* browser_context);
+
   // Ensures that the corresponding ResourceContext is initialized. Normally the
   // BrowserContext initializs the corresponding getters when its objects are
   // created, but if the embedder wants to pass the ResourceContext to another
   // thread before they use BrowserContext, they should call this to make sure
   // that the ResourceContext is ready.
   static void EnsureResourceContextInitialized(BrowserContext* browser_context);
 
   // Tells the HTML5 objects on this context to persist their session state
   // across the next restart.
   static void SaveSessionState(BrowserContext* browser_context);
@@ skipping 62 matching lines @@
 struct hash<content::BrowserContext*> {
   std::size_t operator()(content::BrowserContext* const& p) const {
     return reinterpret_cast<std::size_t>(p);
   }
 };
 
 }  // namespace BASE_HASH_NAMESPACE
 #endif
 
 #endif  // CONTENT_PUBLIC_BROWSER_BROWSER_CONTEXT_H_