OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/drive/file_system.h" | 5 #include "chrome/browser/chromeos/drive/file_system.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 | 93 |
94 cache_.reset(new internal::FileCache(util::GetCacheRootPath(profile_.get()), | 94 cache_.reset(new internal::FileCache(util::GetCacheRootPath(profile_.get()), |
95 blocking_task_runner_, | 95 blocking_task_runner_, |
96 fake_free_disk_space_getter_.get())); | 96 fake_free_disk_space_getter_.get())); |
97 | 97 |
98 mock_cache_observer_.reset(new StrictMock<MockCacheObserver>); | 98 mock_cache_observer_.reset(new StrictMock<MockCacheObserver>); |
99 cache_->AddObserver(mock_cache_observer_.get()); | 99 cache_->AddObserver(mock_cache_observer_.get()); |
100 | 100 |
101 mock_directory_observer_.reset(new StrictMock<MockDirectoryChangeObserver>); | 101 mock_directory_observer_.reset(new StrictMock<MockDirectoryChangeObserver>); |
102 | 102 |
103 cache_->RequestInitializeForTesting(); | 103 bool success = false; |
| 104 cache_->RequestInitialize( |
| 105 google_apis::test_util::CreateCopyResultCallback(&success)); |
104 google_apis::test_util::RunBlockingPoolTask(); | 106 google_apis::test_util::RunBlockingPoolTask(); |
| 107 ASSERT_TRUE(success); |
105 | 108 |
106 SetUpResourceMetadataAndFileSystem(); | 109 SetUpResourceMetadataAndFileSystem(); |
107 } | 110 } |
108 | 111 |
109 void SetUpResourceMetadataAndFileSystem() { | 112 void SetUpResourceMetadataAndFileSystem() { |
110 resource_metadata_.reset(new internal::ResourceMetadata( | 113 resource_metadata_.reset(new internal::ResourceMetadata( |
111 cache_->GetCacheDirectoryPath(internal::FileCache::CACHE_TYPE_META), | 114 cache_->GetCacheDirectoryPath(internal::FileCache::CACHE_TYPE_META), |
112 blocking_task_runner_)); | 115 blocking_task_runner_)); |
113 | 116 |
114 file_system_.reset(new FileSystem(profile_.get(), | 117 file_system_.reset(new FileSystem(profile_.get(), |
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
863 entry->resource_id(), | 866 entry->resource_id(), |
864 entry->file_specific_info().file_md5(), | 867 entry->file_specific_info().file_md5(), |
865 google_apis::test_util::CreateCopyResultCallback(&success, &cache_entry)); | 868 google_apis::test_util::CreateCopyResultCallback(&success, &cache_entry)); |
866 google_apis::test_util::RunBlockingPoolTask(); | 869 google_apis::test_util::RunBlockingPoolTask(); |
867 | 870 |
868 EXPECT_TRUE(success); | 871 EXPECT_TRUE(success); |
869 EXPECT_FALSE(cache_entry.is_mounted()); | 872 EXPECT_FALSE(cache_entry.is_mounted()); |
870 } | 873 } |
871 | 874 |
872 } // namespace drive | 875 } // namespace drive |
OLD | NEW |