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

Side by Side Diff: chrome/browser/sync_file_system/drive_file_sync_service_sync_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 <algorithm> 7 #include <algorithm>
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 virtual void SetUp() OVERRIDE { 83 virtual void SetUp() OVERRIDE {
84 // TODO(tzik): Set up TestExtensionSystem to support simulated relaunch. 84 // TODO(tzik): Set up TestExtensionSystem to support simulated relaunch.
85 85
86 RegisterSyncableFileSystem(); 86 RegisterSyncableFileSystem();
87 local_sync_service_.reset(new LocalFileSyncService(&profile_)); 87 local_sync_service_.reset(new LocalFileSyncService(&profile_));
88 88
89 fake_drive_service_ = new ::drive::FakeDriveService(); 89 fake_drive_service_ = new ::drive::FakeDriveService();
90 fake_drive_service_->Initialize(&profile_); 90 fake_drive_service_->Initialize(&profile_);
91 ASSERT_TRUE(fake_drive_service_->LoadAccountMetadataForWapi( 91 ASSERT_TRUE(fake_drive_service_->LoadAccountMetadataForWapi(
92 "chromeos/sync_file_system/account_metadata.json")); 92 "sync_file_system/account_metadata.json"));
93 ASSERT_TRUE(fake_drive_service_->LoadResourceListForWapi( 93 ASSERT_TRUE(fake_drive_service_->LoadResourceListForWapi(
94 "chromeos/gdata/root_feed.json")); 94 "gdata/root_feed.json"));
95 95
96 drive_uploader_ = new ::drive::DriveUploader( 96 drive_uploader_ = new ::drive::DriveUploader(
97 fake_drive_service_, base::MessageLoopProxy::current().get()); 97 fake_drive_service_, base::MessageLoopProxy::current().get());
98 98
99 fake_drive_helper_.reset(new drive::FakeDriveServiceHelper( 99 fake_drive_helper_.reset(new drive::FakeDriveServiceHelper(
100 fake_drive_service_, drive_uploader_)); 100 fake_drive_service_, drive_uploader_));
101 101
102 bool done = false; 102 bool done = false;
103 SyncStatusCode status = SYNC_STATUS_UNKNOWN; 103 SyncStatusCode status = SYNC_STATUS_UNKNOWN;
104 bool created = false; 104 bool created = false;
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 ASSERT_FALSE(IsDriveAPIDisabled()); 622 ASSERT_FALSE(IsDriveAPIDisabled());
623 TestRemoteFileDeletion(); 623 TestRemoteFileDeletion();
624 } 624 }
625 625
626 TEST_F(DriveFileSyncServiceSyncTest, RemoteFileDeletionTest_WAPI) { 626 TEST_F(DriveFileSyncServiceSyncTest, RemoteFileDeletionTest_WAPI) {
627 ScopedDisableDriveAPI disable_drive_api; 627 ScopedDisableDriveAPI disable_drive_api;
628 TestRemoteFileDeletion(); 628 TestRemoteFileDeletion();
629 } 629 }
630 630
631 } // namespace sync_file_system 631 } // namespace sync_file_system
OLDNEW
« no previous file with comments | « chrome/browser/sync_file_system/drive_file_sync_service_fake_unittest.cc ('k') | chrome/test/data/chromeos/drive/about.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698