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

Side by Side Diff: chrome/browser/chromeos/drive/file_system_unittest.cc

Issue 23625013: Remove drive::FileSystemInterface::Initialize(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 3 months 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 | Annotate | Revision Log
OLDNEW
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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 ASSERT_TRUE(file_util::CreateDirectory(cache_dir)); 111 ASSERT_TRUE(file_util::CreateDirectory(cache_dir));
112 cache_.reset(new internal::FileCache( 112 cache_.reset(new internal::FileCache(
113 metadata_storage_.get(), 113 metadata_storage_.get(),
114 cache_dir, 114 cache_dir,
115 base::MessageLoopProxy::current().get(), 115 base::MessageLoopProxy::current().get(),
116 fake_free_disk_space_getter_.get())); 116 fake_free_disk_space_getter_.get()));
117 ASSERT_TRUE(cache_->Initialize()); 117 ASSERT_TRUE(cache_->Initialize());
118 118
119 resource_metadata_.reset(new internal::ResourceMetadata( 119 resource_metadata_.reset(new internal::ResourceMetadata(
120 metadata_storage_.get(), base::MessageLoopProxy::current())); 120 metadata_storage_.get(), base::MessageLoopProxy::current()));
121 ASSERT_EQ(FILE_ERROR_OK, resource_metadata_->Initialize());
121 122
122 const base::FilePath temp_file_dir = temp_dir_.path().AppendASCII("tmp"); 123 const base::FilePath temp_file_dir = temp_dir_.path().AppendASCII("tmp");
123 ASSERT_TRUE(file_util::CreateDirectory(temp_file_dir)); 124 ASSERT_TRUE(file_util::CreateDirectory(temp_file_dir));
124 file_system_.reset(new FileSystem( 125 file_system_.reset(new FileSystem(
125 pref_service_.get(), 126 pref_service_.get(),
126 cache_.get(), 127 cache_.get(),
127 fake_drive_service_.get(), 128 fake_drive_service_.get(),
128 scheduler_.get(), 129 scheduler_.get(),
129 resource_metadata_.get(), 130 resource_metadata_.get(),
130 base::MessageLoopProxy::current().get(), 131 base::MessageLoopProxy::current().get(),
131 temp_file_dir)); 132 temp_file_dir));
132 file_system_->AddObserver(mock_directory_observer_.get()); 133 file_system_->AddObserver(mock_directory_observer_.get());
133 file_system_->Initialize();
134 134
135 // Disable delaying so that the sync starts immediately. 135 // Disable delaying so that the sync starts immediately.
136 file_system_->sync_client_for_testing()->set_delay_for_testing( 136 file_system_->sync_client_for_testing()->set_delay_for_testing(
137 base::TimeDelta::FromSeconds(0)); 137 base::TimeDelta::FromSeconds(0));
138
139 ASSERT_EQ(FILE_ERROR_OK, resource_metadata_->Initialize());
140 } 138 }
141 139
142 // Loads the full resource list via FakeDriveService. 140 // Loads the full resource list via FakeDriveService.
143 bool LoadFullResourceList() { 141 bool LoadFullResourceList() {
144 FileError error = FILE_ERROR_FAILED; 142 FileError error = FILE_ERROR_FAILED;
145 file_system_->change_list_loader_for_testing()->LoadIfNeeded( 143 file_system_->change_list_loader_for_testing()->LoadIfNeeded(
146 internal::DirectoryFetchInfo(), 144 internal::DirectoryFetchInfo(),
147 google_apis::test_util::CreateCopyResultCallback(&error)); 145 google_apis::test_util::CreateCopyResultCallback(&error));
148 test_util::RunBlockingPoolTask(); 146 test_util::RunBlockingPoolTask();
149 return error == FILE_ERROR_OK; 147 return error == FILE_ERROR_OK;
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 kEmbedOrigin, 739 kEmbedOrigin,
742 google_apis::test_util::CreateCopyResultCallback(&error, &share_url)); 740 google_apis::test_util::CreateCopyResultCallback(&error, &share_url));
743 test_util::RunBlockingPoolTask(); 741 test_util::RunBlockingPoolTask();
744 742
745 // Verify the error and the share url, which should be empty. 743 // Verify the error and the share url, which should be empty.
746 EXPECT_EQ(FILE_ERROR_FAILED, error); 744 EXPECT_EQ(FILE_ERROR_FAILED, error);
747 EXPECT_TRUE(share_url.is_empty()); 745 EXPECT_TRUE(share_url.is_empty());
748 } 746 }
749 747
750 } // namespace drive 748 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698