Revert of Change how the quota system computes the total poolsize for temporary storage

content/browser/storage_partition_impl.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_BROWSER_STORAGE_PARTITION_IMPL_H_
 #define CONTENT_BROWSER_STORAGE_PARTITION_IMPL_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/weak_ptr.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/background_sync/background_sync_context.h"
 #include "content/browser/broadcast_channel/broadcast_channel_provider.h"
 #include "content/browser/cache_storage/cache_storage_context_impl.h"
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
 #include "content/browser/host_zoom_level_context.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/browser/notifications/platform_notification_context_impl.h"
 #include "content/browser/payments/payment_app_context_impl.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
@@ skipping 131 matching lines @@
   // StoragePartition's on-disk-storage.
   //
   // If |in_memory| is true, the |relative_partition_path| is (ab)used as a way
   // of distinguishing different in-memory partitions, but nothing is persisted
   // on to disk.
   static std::unique_ptr<StoragePartitionImpl> Create(
       BrowserContext* context,
       bool in_memory,
       const base::FilePath& relative_partition_path);
 
-  StoragePartitionImpl(BrowserContext* browser_context,
-                       const base::FilePath& partition_path,
-                       storage::SpecialStoragePolicy* special_storage_policy);
+  StoragePartitionImpl(
+      BrowserContext* browser_context,
+      const base::FilePath& partition_path,
+      storage::QuotaManager* quota_manager,
+      ChromeAppCacheService* appcache_service,
+      storage::FileSystemContext* filesystem_context,
+      storage::DatabaseTracker* database_tracker,
+      DOMStorageContextWrapper* dom_storage_context,
+      IndexedDBContextImpl* indexed_db_context,
+      CacheStorageContextImpl* cache_storage_context,
+      ServiceWorkerContextWrapper* service_worker_context,
+      storage::SpecialStoragePolicy* special_storage_policy,
+      HostZoomLevelContext* host_zoom_level_context,
+      PlatformNotificationContextImpl* platform_notification_context,
+      BackgroundSyncContext* background_sync_context,
+      PaymentAppContextImpl* payment_app_context,
+      scoped_refptr<BroadcastChannelProvider>broadcast_channel_provider);
 
   // We will never have both remove_origin be populated and a cookie_matcher.
   void ClearDataImpl(uint32_t remove_mask,
                      uint32_t quota_storage_remove_mask,
                      const GURL& remove_origin,
                      const OriginMatcherFunction& origin_matcher,
                      const CookieMatcherFunction& cookie_matcher,
                      net::URLRequestContextGetter* rq_context,
                      const base::Time begin,
                      const base::Time end,
                      const base::Closure& callback);
 
   // Used by StoragePartitionImplMap.
   //
   // TODO(ajwong): These should be taken in the constructor and in Create() but
   // because the URLRequestContextGetter still lives in Profile with a tangled
   // initialization, if we try to retrieve the URLRequestContextGetter()
   // before the default StoragePartition is created, we end up reentering the
   // construction and double-initializing.  For now, we retain the legacy
   // behavior while allowing StoragePartitionImpl to expose these accessors by
   // letting StoragePartitionImplMap call these two private settings at the
   // appropriate time.  These should move back into the constructor once
   // URLRequestContextGetter's lifetime is sorted out. We should also move the
   // PostCreateInitialization() out of StoragePartitionImplMap.
   void SetURLRequestContext(
       net::URLRequestContextGetter* url_request_context);
   void SetMediaURLRequestContext(
       net::URLRequestContextGetter* media_url_request_context);
 
-  // Function used by the quota system to ask the embedder for the
-  // storage configuration info.
-  void GetQuotaSettings(const storage::OptionalQuotaSettingsCallback& callback);
-
   base::FilePath partition_path_;
   scoped_refptr<net::URLRequestContextGetter> url_request_context_;
   scoped_refptr<net::URLRequestContextGetter> media_url_request_context_;
   scoped_refptr<storage::QuotaManager> quota_manager_;
   scoped_refptr<ChromeAppCacheService> appcache_service_;
   scoped_refptr<storage::FileSystemContext> filesystem_context_;
   scoped_refptr<storage::DatabaseTracker> database_tracker_;
   scoped_refptr<DOMStorageContextWrapper> dom_storage_context_;
   scoped_refptr<IndexedDBContextImpl> indexed_db_context_;
   scoped_refptr<CacheStorageContextImpl> cache_storage_context_;
   scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;
   scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy_;
   scoped_refptr<HostZoomLevelContext> host_zoom_level_context_;
   scoped_refptr<PlatformNotificationContextImpl> platform_notification_context_;
   scoped_refptr<BackgroundSyncContext> background_sync_context_;
   scoped_refptr<PaymentAppContextImpl> payment_app_context_;
   scoped_refptr<BroadcastChannelProvider> broadcast_channel_provider_;
 
   mojo::BindingSet<mojom::StoragePartitionService> bindings_;
 
   // Raw pointer that should always be valid. The BrowserContext owns the
   // StoragePartitionImplMap which then owns StoragePartitionImpl. When the
   // BrowserContext is destroyed, |this| will be destroyed too.
   BrowserContext* browser_context_;
 
-  base::WeakPtrFactory<StoragePartitionImpl> weak_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(StoragePartitionImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_STORAGE_PARTITION_IMPL_H_