Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(263)

Side by Side Diff: chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc

Issue 2592793002: Revert of Change how the quota system computes the total poolsize for temporary storage (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdint.h> 5 #include <stdint.h>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
11 #include "base/threading/thread_task_runner_handle.h" 11 #include "base/threading/thread_task_runner_handle.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/apps/app_browsertest_util.h" 13 #include "chrome/browser/apps/app_browsertest_util.h"
14 #include "chrome/browser/extensions/extension_service.h" 14 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/signin/fake_signin_manager_builder.h" 15 #include "chrome/browser/signin/fake_signin_manager_builder.h"
16 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h" 16 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h"
17 #include "chrome/browser/sync_file_system/local/local_file_sync_service.h" 17 #include "chrome/browser/sync_file_system/local/local_file_sync_service.h"
18 #include "chrome/browser/sync_file_system/sync_file_system_service.h" 18 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
19 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h" 19 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"
20 #include "components/drive/service/fake_drive_service.h" 20 #include "components/drive/service/fake_drive_service.h"
21 #include "content/public/browser/storage_partition.h"
22 #include "extensions/test/extension_test_message_listener.h" 21 #include "extensions/test/extension_test_message_listener.h"
23 #include "extensions/test/result_catcher.h" 22 #include "extensions/test/result_catcher.h"
24 #include "storage/browser/quota/quota_manager.h" 23 #include "storage/browser/quota/quota_manager.h"
25 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h" 24 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
26 #include "third_party/leveldatabase/src/include/leveldb/env.h" 25 #include "third_party/leveldatabase/src/include/leveldb/env.h"
27 26
28 namespace sync_file_system { 27 namespace sync_file_system {
29 28
30 namespace { 29 namespace {
31 30
(...skipping 23 matching lines...) Expand all
55 54
56 } // namespace 55 } // namespace
57 56
58 class SyncFileSystemTest : public extensions::PlatformAppBrowserTest, 57 class SyncFileSystemTest : public extensions::PlatformAppBrowserTest,
59 public drive::FakeDriveService::ChangeObserver { 58 public drive::FakeDriveService::ChangeObserver {
60 public: 59 public:
61 SyncFileSystemTest() 60 SyncFileSystemTest()
62 : remote_service_(NULL) { 61 : remote_service_(NULL) {
63 } 62 }
64 63
64 void SetUpInProcessBrowserTestFixture() override {
65 ExtensionApiTest::SetUpInProcessBrowserTestFixture();
66 real_minimum_preserved_space_ =
67 storage::QuotaManager::kMinimumPreserveForSystem;
68 storage::QuotaManager::kMinimumPreserveForSystem = 0;
69 }
70
71 void TearDownInProcessBrowserTestFixture() override {
72 storage::QuotaManager::kMinimumPreserveForSystem =
73 real_minimum_preserved_space_;
74 ExtensionApiTest::TearDownInProcessBrowserTestFixture();
75 }
76
65 scoped_refptr<base::SequencedTaskRunner> MakeSequencedTaskRunner() { 77 scoped_refptr<base::SequencedTaskRunner> MakeSequencedTaskRunner() {
66 scoped_refptr<base::SequencedWorkerPool> worker_pool = 78 scoped_refptr<base::SequencedWorkerPool> worker_pool =
67 content::BrowserThread::GetBlockingPool(); 79 content::BrowserThread::GetBlockingPool();
68 80
69 return worker_pool->GetSequencedTaskRunnerWithShutdownBehavior( 81 return worker_pool->GetSequencedTaskRunnerWithShutdownBehavior(
70 worker_pool->GetSequenceToken(), 82 worker_pool->GetSequenceToken(),
71 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); 83 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
72 } 84 }
73 85
74 void SetUpOnMainThread() override { 86 void SetUpOnMainThread() override {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 } 150 }
139 151
140 private: 152 private:
141 base::ScopedTempDir base_dir_; 153 base::ScopedTempDir base_dir_;
142 std::unique_ptr<leveldb::Env> in_memory_env_; 154 std::unique_ptr<leveldb::Env> in_memory_env_;
143 155
144 std::unique_ptr<FakeSigninManagerForTesting> fake_signin_manager_; 156 std::unique_ptr<FakeSigninManagerForTesting> fake_signin_manager_;
145 157
146 drive_backend::SyncEngine* remote_service_; 158 drive_backend::SyncEngine* remote_service_;
147 159
160 int64_t real_minimum_preserved_space_;
161
148 DISALLOW_COPY_AND_ASSIGN(SyncFileSystemTest); 162 DISALLOW_COPY_AND_ASSIGN(SyncFileSystemTest);
149 }; 163 };
150 164
151 IN_PROC_BROWSER_TEST_F(SyncFileSystemTest, AuthorizationTest) { 165 IN_PROC_BROWSER_TEST_F(SyncFileSystemTest, AuthorizationTest) {
152 ExtensionTestMessageListener open_failure( 166 ExtensionTestMessageListener open_failure(
153 "checkpoint: Failed to get syncfs", true); 167 "checkpoint: Failed to get syncfs", true);
154 ExtensionTestMessageListener bar_created( 168 ExtensionTestMessageListener bar_created(
155 "checkpoint: \"/bar\" created", true); 169 "checkpoint: \"/bar\" created", true);
156 ExtensionTestMessageListener foo_created( 170 ExtensionTestMessageListener foo_created(
157 "checkpoint: \"/foo\" created", true); 171 "checkpoint: \"/foo\" created", true);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 204
191 sync_engine()->GoogleSigninSucceeded("test_account", "tester", "testing"); 205 sync_engine()->GoogleSigninSucceeded("test_account", "tester", "testing");
192 WaitUntilIdle(); 206 WaitUntilIdle();
193 207
194 bar_created.Reply("resume"); 208 bar_created.Reply("resume");
195 209
196 EXPECT_TRUE(catcher.GetNextResult()); 210 EXPECT_TRUE(catcher.GetNextResult());
197 } 211 }
198 212
199 } // namespace sync_file_system 213 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698