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

Side by Side Diff: chrome/browser/sync_file_system/drive_file_sync_service_fake_unittest.cc

Issue 18355004: google_apis: Move data files out of chrome/test/data/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix extension tests Created 7 years, 5 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/sync_file_system/drive_file_sync_service.h" 5 #include "chrome/browser/sync_file_system/drive_file_sync_service.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 metadata_store_.reset(new DriveMetadataStore( 208 metadata_store_.reset(new DriveMetadataStore(
209 fake_drive_helper_->base_dir_path(), 209 fake_drive_helper_->base_dir_path(),
210 base::MessageLoopProxy::current().get())); 210 base::MessageLoopProxy::current().get()));
211 211
212 bool done = false; 212 bool done = false;
213 metadata_store_->Initialize(base::Bind(&DidInitialize, &done)); 213 metadata_store_->Initialize(base::Bind(&DidInitialize, &done));
214 base::MessageLoop::current()->RunUntilIdle(); 214 base::MessageLoop::current()->RunUntilIdle();
215 EXPECT_TRUE(done); 215 EXPECT_TRUE(done);
216 216
217 fake_drive_service_->LoadResourceListForWapi( 217 fake_drive_service_->LoadResourceListForWapi(
218 "chromeos/sync_file_system/initialize.json"); 218 "sync_file_system/initialize.json");
219 fake_drive_service()->LoadAccountMetadataForWapi( 219 fake_drive_service()->LoadAccountMetadataForWapi(
220 "chromeos/sync_file_system/account_metadata.json"); 220 "sync_file_system/account_metadata.json");
221 221
222 // Setup the sync root directory. 222 // Setup the sync root directory.
223 EXPECT_EQ(google_apis::HTTP_CREATED, 223 EXPECT_EQ(google_apis::HTTP_CREATED,
224 fake_drive_helper_->AddOrphanedFolder( 224 fake_drive_helper_->AddOrphanedFolder(
225 drive::APIUtil::GetSyncRootDirectoryName(), 225 drive::APIUtil::GetSyncRootDirectoryName(),
226 &sync_root_resource_id_)); 226 &sync_root_resource_id_));
227 metadata_store()->SetSyncRootDirectory(sync_root_resource_id_); 227 metadata_store()->SetSyncRootDirectory(sync_root_resource_id_);
228 } 228 }
229 229
230 void SetUpDriveSyncService(bool enabled) { 230 void SetUpDriveSyncService(bool enabled) {
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 } 832 }
833 833
834 TEST_F(DriveFileSyncServiceFakeTest, RemoteChange_Folder_WAPI) { 834 TEST_F(DriveFileSyncServiceFakeTest, RemoteChange_Folder_WAPI) {
835 ScopedDisableDriveAPI disable_drive_api; 835 ScopedDisableDriveAPI disable_drive_api;
836 TestRemoteChange_Folder(); 836 TestRemoteChange_Folder();
837 } 837 }
838 838
839 #endif // !defined(OS_ANDROID) 839 #endif // !defined(OS_ANDROID)
840 840
841 } // namespace sync_file_system 841 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698