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

Side by Side Diff: chrome/browser/chromeos/drive/file_system/operation_test_base.cc

Issue 96413002: Move c/b/google_apis to google_apis/drive. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years 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/chromeos/drive/file_system/operation_test_base.h" 5 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
6 6
7 #include "base/prefs/testing_pref_service.h" 7 #include "base/prefs/testing_pref_service.h"
8 #include "base/threading/sequenced_worker_pool.h" 8 #include "base/threading/sequenced_worker_pool.h"
9 #include "chrome/browser/chromeos/drive/change_list_processor.h" 9 #include "chrome/browser/chromeos/drive/change_list_processor.h"
10 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" 10 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
11 #include "chrome/browser/chromeos/drive/file_cache.h" 11 #include "chrome/browser/chromeos/drive/file_cache.h"
12 #include "chrome/browser/chromeos/drive/file_system/operation_observer.h" 12 #include "chrome/browser/chromeos/drive/file_system/operation_observer.h"
13 #include "chrome/browser/chromeos/drive/job_scheduler.h" 13 #include "chrome/browser/chromeos/drive/job_scheduler.h"
14 #include "chrome/browser/chromeos/drive/resource_metadata.h" 14 #include "chrome/browser/chromeos/drive/resource_metadata.h"
15 #include "chrome/browser/chromeos/drive/test_util.h" 15 #include "chrome/browser/chromeos/drive/test_util.h"
16 #include "chrome/browser/drive/fake_drive_service.h" 16 #include "chrome/browser/drive/fake_drive_service.h"
17 #include "chrome/browser/google_apis/test_util.h"
18 #include "content/public/browser/browser_thread.h" 17 #include "content/public/browser/browser_thread.h"
18 #include "google_apis/drive/test_util.h"
19 19
20 namespace drive { 20 namespace drive {
21 namespace file_system { 21 namespace file_system {
22 22
23 OperationTestBase::LoggingObserver::LoggingObserver() { 23 OperationTestBase::LoggingObserver::LoggingObserver() {
24 } 24 }
25 25
26 OperationTestBase::LoggingObserver::~LoggingObserver() { 26 OperationTestBase::LoggingObserver::~LoggingObserver() {
27 } 27 }
28 28
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 FileError OperationTestBase::CheckForUpdates() { 170 FileError OperationTestBase::CheckForUpdates() {
171 FileError error = FILE_ERROR_FAILED; 171 FileError error = FILE_ERROR_FAILED;
172 change_list_loader_->CheckForUpdates( 172 change_list_loader_->CheckForUpdates(
173 google_apis::test_util::CreateCopyResultCallback(&error)); 173 google_apis::test_util::CreateCopyResultCallback(&error));
174 test_util::RunBlockingPoolTask(); 174 test_util::RunBlockingPoolTask();
175 return error; 175 return error;
176 } 176 }
177 177
178 } // namespace file_system 178 } // namespace file_system
179 } // namespace drive 179 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698