| Index: chrome/browser/browsing_data_file_system_helper_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/browsing_data_file_system_helper_unittest.cc (revision 122416)
|
| +++ chrome/browser/browsing_data_file_system_helper_unittest.cc (working copy)
|
| @@ -18,6 +18,7 @@
|
| #include "webkit/fileapi/file_system_usage_cache.h"
|
| #include "webkit/fileapi/sandbox_mount_point_provider.h"
|
|
|
| +using content::BrowserContext;
|
| using content::BrowserThread;
|
|
|
| namespace {
|
| @@ -57,10 +58,15 @@
|
| : helper_(BrowsingDataFileSystemHelper::Create(&profile_)),
|
| canned_helper_(new CannedBrowsingDataFileSystemHelper(&profile_)),
|
| ui_thread_(BrowserThread::UI, &message_loop_),
|
| + db_thread_(BrowserThread::DB, &message_loop_),
|
| + webkit_thread_(BrowserThread::WEBKIT_DEPRECATED, &message_loop_),
|
| file_thread_(BrowserThread::FILE, &message_loop_),
|
| + file_user_blocking_thread_(
|
| + BrowserThread::FILE_USER_BLOCKING, &message_loop_),
|
| io_thread_(BrowserThread::IO, &message_loop_) {
|
| }
|
| - virtual ~BrowsingDataFileSystemHelperTest() {}
|
| + virtual ~BrowsingDataFileSystemHelperTest() {
|
| + }
|
|
|
| TestingProfile* GetProfile() {
|
| return &profile_;
|
| @@ -131,7 +137,8 @@
|
| // Sets up kOrigin1 with a temporary file system, kOrigin2 with a persistent
|
| // file system, and kOrigin3 with both.
|
| virtual void PopulateTestFileSystemData() {
|
| - sandbox_ = profile_.GetFileSystemContext()->sandbox_provider();
|
| + sandbox_ = BrowserContext::GetFileSystemContext(&profile_)->
|
| + sandbox_provider();
|
|
|
| CreateDirectoryForOriginAndType(kOrigin1, kTemporary);
|
| CreateDirectoryForOriginAndType(kOrigin2, kPersistent);
|
| @@ -175,7 +182,10 @@
|
| // defined in the order they're listed here. Oh how I love C++.
|
| MessageLoopForUI message_loop_;
|
| content::TestBrowserThread ui_thread_;
|
| + content::TestBrowserThread db_thread_;
|
| + content::TestBrowserThread webkit_thread_;
|
| content::TestBrowserThread file_thread_;
|
| + content::TestBrowserThread file_user_blocking_thread_;
|
| content::TestBrowserThread io_thread_;
|
| TestingProfile profile_;
|
|
|
|
|