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

chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc

Index: chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc
index 18b1bf3d38a14b63eb74bbab4f02fbb90df5bd34..1ee219968310f9205bb93602175e905304eae483 100644
--- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc
+++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc
@@ -18,7 +18,6 @@
 #include "chrome/browser/sync_file_system/sync_status_code.h"
 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
 #include "chrome/test/base/test_switches.h"
-#include "content/public/browser/storage_partition.h"
 #include "extensions/browser/extension_function.h"
 #include "storage/browser/fileapi/file_system_url.h"
 #include "storage/browser/quota/quota_manager.h"
@@ -41,11 +40,16 @@ class SyncFileSystemApiTest : public ExtensionApiTest {
  public:
   SyncFileSystemApiTest()
       : mock_remote_service_(NULL),
+        real_minimum_preserved_space_(0),
         real_default_quota_(0) {}
 
   void SetUpInProcessBrowserTestFixture() override {
     ExtensionApiTest::SetUpInProcessBrowserTestFixture();
 
+    real_minimum_preserved_space_ =
+        storage::QuotaManager::kMinimumPreserveForSystem;
+    storage::QuotaManager::kMinimumPreserveForSystem = 0;
+
     // TODO(calvinlo): Update test code after default quota is made const
     // (http://crbug.com/155488).
     real_default_quota_ =
@@ -54,6 +58,8 @@ class SyncFileSystemApiTest : public ExtensionApiTest {
   }
 
   void TearDownInProcessBrowserTestFixture() override {
+    storage::QuotaManager::kMinimumPreserveForSystem =
+        real_minimum_preserved_space_;
     storage::QuotaManager::kSyncableStorageDefaultHostQuota =
         real_default_quota_;
     ExtensionApiTest::TearDownInProcessBrowserTestFixture();
@@ -75,6 +81,7 @@ class SyncFileSystemApiTest : public ExtensionApiTest {
 
  private:
   ::testing::NiceMock<MockRemoteFileSyncService>* mock_remote_service_;
+  int64_t real_minimum_preserved_space_;
   int64_t real_default_quota_;
 };